From d9b3fcd217eb74d7989f442922a78a5074c96624 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Sat, 31 Jan 2015 16:34:13 +0300 Subject: [PATCH] diff: cleanup: move to another package --- .../CompareValueWithClipboardAction.java | 8 +-- .../util => }/diff/DiffContentFactory.java | 8 +-- .../util/diff/api => diff}/DiffContext.java | 2 +- .../util => }/diff/DiffDialogHints.java | 2 +- .../{openapi/util => }/diff/DiffManager.java | 6 +-- .../util => }/diff/DiffManagerEx.java | 7 ++- .../util => }/diff/DiffRequestFactory.java | 4 +- .../util => }/diff/DiffRequestPanel.java | 4 +- .../util/diff/api => diff}/DiffTool.java | 6 +-- .../util/diff/api => diff}/FrameDiffTool.java | 4 +- .../api => diff}/SuppressiveDiffTool.java | 2 +- .../diff/chains/DiffRequestChain.java | 2 +- .../diff/chains/DiffRequestPresentable.java | 4 +- .../DiffRequestPresentableException.java | 2 +- .../diff/chains/SimpleDiffRequestChain.java | 4 +- .../util => }/diff/comparison/ByChar.java | 10 ++-- .../util => }/diff/comparison/ByLine.java | 22 ++++---- .../util => }/diff/comparison/ByWord.java | 20 +++---- .../diff/comparison/ChangeCorrector.java | 20 +++---- .../diff/comparison/ComparisonPolicy.java | 2 +- .../diff/comparison/ComparisonUtil.java | 14 ++--- .../diff/comparison/DiffTooBigException.java | 2 +- .../diff/comparison/LineFragmentSplitter.java | 12 ++--- .../util => }/diff/comparison/MergeUtil.java | 12 ++--- .../util => }/diff/comparison/TextChunk.java | 2 +- .../util => }/diff/comparison/TrimUtil.java | 6 +-- .../iterables/ChangeDiffIterableBase.java | 4 +- .../iterables/DiffChangeDiffIterable.java | 2 +- .../iterables/DiffFragmentsDiffIterable.java | 4 +- .../comparison/iterables/DiffIterable.java | 4 +- .../iterables/DiffIterableBase.java | 4 +- .../iterables/DiffIterableUtil.java | 8 +-- .../iterables/FairDiffIterable.java | 2 +- .../iterables/FairDiffIterableWrapper.java | 4 +- .../InvertedDiffIterableWrapper.java | 4 +- .../iterables/RangesDiffIterable.java | 4 +- .../iterables/SubiterableDiffIterable.java | 4 +- .../diff/contents/BinaryFileContent.java | 2 +- .../diff/contents/BinaryFileContentImpl.java | 2 +- .../util => }/diff/contents/DiffContent.java | 4 +- .../diff/contents/DirectoryContent.java | 2 +- .../diff/contents/DirectoryContentImpl.java | 2 +- .../diff/contents/DocumentContent.java | 2 +- .../diff/contents/DocumentContentImpl.java | 2 +- .../diff/contents/DocumentContentWrapper.java | 2 +- .../util => }/diff/contents/EmptyContent.java | 2 +- .../util => }/diff/contents/FileContent.java | 2 +- .../contents/FileDocumentContentImpl.java | 2 +- .../diff/contents/SimpleContentBuilder.java | 2 +- .../diff/fragments/DiffFragment.java | 2 +- .../diff/fragments/DiffFragmentImpl.java | 2 +- .../diff/fragments/LineFragment.java | 2 +- .../diff/fragments/LineFragmentImpl.java | 2 +- .../diff/fragments/MergeLineFragment.java | 4 +- .../diff/impl/DiffContentFactoryImpl.java | 6 +-- .../diff/impl/DiffRequestFactoryImpl.java | 12 ++--- .../diff/requests/ContentDiffRequest.java | 4 +- .../util => }/diff/requests/DiffRequest.java | 2 +- .../diff/requests/LoadingDiffRequest.java | 2 +- .../diff/requests/MessageDiffRequest.java | 2 +- .../diff/requests/NoDiffRequest.java | 2 +- .../OperationCanceledDiffRequest.java | 2 +- .../diff/requests/SimpleDiffRequest.java | 4 +- .../util => }/diff/util/DiffPlaces.java | 2 +- .../util => }/diff/util/DiffUserDataKeys.java | 2 +- .../{openapi/util => }/diff/util/Side.java | 6 +-- .../util => }/diff/util/ThreeSide.java | 2 +- .../util => }/diff/DiffManagerImpl.java | 23 ++++---- .../diff/actions/BaseShowDiffAction.java | 8 +-- .../diff/actions/BufferedLineIterator.java | 2 +- .../CompareClipboardWithSelectionAction.java | 14 ++--- .../actions/CompareFileWithEditorAction.java | 16 +++--- .../diff/actions/CompareFilesAction.java | 6 +-- .../diff/actions/DocumentFragmentContent.java | 4 +- .../diff/actions/DocumentsSynchronizer.java | 2 +- .../actions/NavigationContextChecker.java | 2 +- .../actions/impl/FocusOppositePaneAction.java | 7 ++- .../actions/impl/GoToChangePopupAction.java | 2 +- .../actions/impl/GoToChangePopupBuilder.java | 6 +-- .../diff/actions/impl/NextChangeAction.java | 2 +- .../actions/impl/NextDifferenceAction.java | 2 +- .../diff/actions/impl/OpenInEditorAction.java | 12 ++--- .../impl/OpenInEditorWithMouseAction.java | 2 +- .../diff/actions/impl/PrevChangeAction.java | 2 +- .../actions/impl/PrevDifferenceAction.java | 2 +- .../actions/impl/SetEditorSettingsAction.java | 4 +- .../diff/actions/impl/ShowOldDiffAction.java | 10 ++-- .../applications/ApplicationStarterBase.java | 2 +- .../diff/applications/DiffApplication.java | 10 ++-- .../impl/CacheDiffRequestChainProcessor.java | 22 ++++---- .../diff/impl/DiffRequestPanelImpl.java | 10 ++-- .../diff/impl/DiffRequestProcessor.java | 40 +++++++------- .../diff/impl/DiffViewerWrapper.java | 8 +-- .../util => }/diff/impl/DiffWindow.java | 8 +-- .../util => }/diff/impl/DiffWindowBase.java | 8 +-- .../util => }/diff/impl/ModifiablePanel.java | 2 +- .../diff/requests/ErrorDiffRequest.java | 4 +- .../settings/DiffSettingsConfigurable.java | 2 +- .../settings/DiffSettingsPaneExternall.form | 2 +- .../diff/settings/DiffSettingsPanel.form | 4 +- .../diff/settings/DiffSettingsPanel.java | 6 +-- .../ExternalDiffSettingsConfigurable.java | 2 +- .../settings/ExternalDiffSettingsPanel.java | 4 +- .../util => }/diff/tools/ErrorDiffTool.java | 14 ++--- .../diff/tools/binary/BinaryContentPanel.java | 4 +- .../diff/tools/binary/BinaryDiffPanel.java | 8 +-- .../diff/tools/binary/BinaryDiffTool.java | 8 +-- .../diff/tools/binary/BinaryDiffViewer.java | 28 +++++----- .../diff/tools/dir/DifDiffViewer.java | 16 +++--- .../util => }/diff/tools/dir/DirDiffTool.java | 10 ++-- .../tools/external/ExternalDiffSettings.java | 4 +- .../diff/tools/external/ExternalDiffTool.java | 20 +++---- .../tools/external/ExternalDiffToolUtil.java | 4 +- .../diff/tools/fragmented/ChangedBlock.java | 4 +- .../diff/tools/fragmented/HighlightRange.java | 4 +- .../tools/fragmented/LineNumberConvertor.java | 2 +- .../tools/fragmented/OnesideContentPanel.java | 2 +- .../tools/fragmented/OnesideDiffChange.java | 8 +-- .../tools/fragmented/OnesideDiffPanel.java | 10 ++-- .../tools/fragmented/OnesideDiffTool.java | 8 +-- .../tools/fragmented/OnesideDiffViewer.java | 52 +++++++++---------- .../fragmented/OnesideEditorHighlighter.java | 2 +- .../OnesideEditorRangeHighlighter.java | 2 +- .../fragmented/OnesideFragmentBuilder.java | 10 ++-- .../diff/tools/simple/DiffOperation.java | 2 +- .../diff/tools/simple/SimpleDiffChange.java | 14 ++--- .../diff/tools/simple/SimpleDiffTool.java | 8 +-- .../diff/tools/simple/SimpleDiffViewer.java | 38 +++++++------- .../simple/SimpleThreesideDiffChange.java | 10 ++-- .../simple/SimpleThreesideDiffViewer.java | 39 +++++++------- .../diff/tools/util/BaseSyncScrollable.java | 4 +- .../diff/tools/util/DiffDataKeys.java | 8 +-- .../diff/tools/util/DiffSplitter.java | 2 +- .../diff/tools/util/EditorsDiffPanelBase.java | 8 +-- .../diff/tools/util/FoldingModelSupport.java | 16 +++--- .../diff/tools/util/LineFragmentCache.java | 6 +-- .../util/PrevNextDifferenceIterable.java | 2 +- .../diff/tools/util/SoftHardCacheMap.java | 2 +- .../diff/tools/util/StatusPanel.java | 2 +- .../diff/tools/util/SyncScrollSupport.java | 6 +-- .../diff/tools/util/ThreeDiffSplitter.java | 8 +-- .../diff/tools/util/base/DiffPanelBase.java | 6 +-- .../diff/tools/util/base/DiffViewerBase.java | 18 +++---- .../diff/tools/util/base/HighlightPolicy.java | 2 +- .../diff/tools/util/base/IgnorePolicy.java | 4 +- .../util/base/ListenerDiffViewerBase.java | 14 ++--- .../util/base/TextDiffSettingsHolder.java | 6 +-- .../tools/util/base/TextDiffViewerBase.java | 16 +++--- .../util/threeside/ThreesideContentPanel.java | 8 +-- .../threeside/ThreesideTextContentPanel.java | 4 +- .../threeside/ThreesideTextDiffPanel.java | 6 +-- .../threeside/ThreesideTextDiffViewer.java | 31 ++++++----- .../util/twoside/TwosideContentPanel.java | 4 +- .../util/twoside/TwosideTextContentPanel.java | 2 +- .../util/twoside/TwosideTextDiffPanel.java | 6 +-- .../util/twoside/TwosideTextDiffViewer.java | 31 ++++++----- .../diff/util/DiffDividerDrawUtil.java | 2 +- .../util => }/diff/util/DiffDrawUtil.java | 2 +- .../util/DiffEmptyHighlighterRenderer.java | 2 +- .../diff/util/DiffLineMarkerRenderer.java | 2 +- .../diff/util/DiffLineSeparatorRenderer.java | 2 +- .../diff/util/DiffUserDataKeysEx.java | 4 +- .../util => }/diff/util/DiffUtil.java | 36 ++++++------- .../util => }/diff/util/TextDiffType.java | 2 +- .../diff/util/TextDiffTypeFactory.java | 2 +- .../WaitingBackgroundableTaskExecutor.java | 2 +- .../diff/comparison/AutoTestCase.java | 2 +- .../comparison/CharComparisonUtilTest.java | 2 +- .../comparison/ComparisonUtilAutoTest.java | 6 +-- .../comparison/ComparisonUtilTestBase.java | 6 +-- .../comparison/LineComparisonUtilTest.java | 2 +- .../comparison/SplitComparisonUtilTest.java | 2 +- .../comparison/WordComparisonUtilTest.java | 2 +- .../fragmented/LineNumberConvertorTest.java | 2 +- .../ui/views/DirectoryHistoryDialog.java | 2 +- .../impl/FileDocumentManagerImpl.java | 14 ++--- .../src/META-INF/PlatformExtensionPoints.xml | 2 +- .../src/META-INF/PlatformExtensions.xml | 26 +++++----- .../src/idea/PlatformActions.xml | 6 +-- .../actions/TestDiffRequestProcessor.java | 21 ++++---- .../actions/ViewAssertEqualsDiffAction.java | 8 +-- .../vcs/actions/DiffActionExecutor.java | 18 +++---- .../vcs/actions/ShowDiffFromAnnotation.java | 4 +- .../vcs/changes/CacheChangeProcessor.java | 14 ++--- .../vcs/changes/ChangesViewManager.java | 6 +-- .../actions/diff/ChangeDiffRequestChain.java | 4 +- .../diff/ChangeDiffRequestPresentable.java | 20 +++---- .../diff/ChangeDiffRequestProvider.java | 4 +- .../diff/ChangeDiffViewerWrapperProvider.java | 4 +- .../diff/ChangeGoToChangePopupAction.java | 4 +- .../diff/FileAwareDocumentContent.java | 7 ++- .../changes/actions/diff/ShowDiffAction.java | 8 +-- .../changes/actions/diff/ShowDiffContext.java | 2 +- .../actions/migrate/MigrateDiffTool.java | 6 +-- .../actions/migrate/MigrateToNewDiffUtil.java | 28 +++++----- .../vcs/changes/ui/ChangesBrowser.java | 4 +- .../changes/ui/CommitChangeListDialog.java | 4 +- .../vcs/ex/ShowLineStatusRangeDiffAction.java | 16 +++--- .../openapi/vcs/history/VcsHistoryUtil.java | 13 +++-- .../vcs/update/ShowUpdatedDiffAction.java | 2 +- .../actions/XCompareWithClipboardAction.java | 8 +-- .../com/intellij/ide/commander/Commander.java | 2 +- .../ide/commander/PsiDiffContentFactory.java | 12 ++--- plugins/svn4idea/src/META-INF/plugin.xml | 6 +-- .../AbstractShowPropertiesDiffAction.java | 4 +- .../idea/svn/diff/FileWithBranchComparer.java | 12 ++--- .../difftool/SvnChangeDiffViewerProvider.java | 6 +-- .../svn/difftool/SvnDiffSettingsHolder.java | 4 +- .../idea/svn/difftool/SvnDiffViewer.java | 20 +++---- .../svn/difftool/SvnDiffViewerWrapper.java | 8 +-- .../SvnPhantomChangeDiffRequestProvider.java | 8 +-- .../SvnTreeConflictDiffRequestProvider.java | 10 ++-- .../properties/PropertiesTableModel.java | 12 ++--- .../properties/SvnPropertiesDiffRequest.java | 6 +-- .../properties/SvnPropertiesDiffTool.java | 6 +-- .../properties/SvnPropertiesDiffViewer.java | 20 +++---- 216 files changed, 804 insertions(+), 799 deletions(-) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/DiffContentFactory.java (91%) rename platform/diff-api/src/com/intellij/{openapi/util/diff/api => diff}/DiffContext.java (95%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/DiffDialogHints.java (97%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/DiffManager.java (90%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/DiffManagerEx.java (87%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/DiffRequestFactory.java (93%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/DiffRequestPanel.java (91%) rename platform/diff-api/src/com/intellij/{openapi/util/diff/api => diff}/DiffTool.java (85%) rename platform/diff-api/src/com/intellij/{openapi/util/diff/api => diff}/FrameDiffTool.java (93%) rename platform/diff-api/src/com/intellij/{openapi/util/diff/api => diff}/SuppressiveDiffTool.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/chains/DiffRequestChain.java (95%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/chains/DiffRequestPresentable.java (91%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/chains/DiffRequestPresentableException.java (95%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/chains/SimpleDiffRequestChain.java (96%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/ByChar.java (96%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/ByLine.java (93%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/ByWord.java (97%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/ChangeCorrector.java (89%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/ComparisonPolicy.java (93%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/ComparisonUtil.java (96%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/DiffTooBigException.java (95%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/LineFragmentSplitter.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/MergeUtil.java (95%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/TextChunk.java (96%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/TrimUtil.java (97%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/ChangeDiffIterableBase.java (95%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/DiffChangeDiffIterable.java (96%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/DiffFragmentsDiffIterable.java (93%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/DiffIterable.java (87%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/DiffIterableBase.java (90%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/DiffIterableUtil.java (97%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/FairDiffIterable.java (92%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/FairDiffIterableWrapper.java (90%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/InvertedDiffIterableWrapper.java (89%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/RangesDiffIterable.java (92%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/comparison/iterables/SubiterableDiffIterable.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/BinaryFileContent.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/BinaryFileContentImpl.java (97%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/DiffContent.java (91%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/DirectoryContent.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/DirectoryContentImpl.java (97%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/DocumentContent.java (97%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/DocumentContentImpl.java (98%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/DocumentContentWrapper.java (97%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/EmptyContent.java (95%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/FileContent.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/FileDocumentContentImpl.java (97%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/contents/SimpleContentBuilder.java (98%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/fragments/DiffFragment.java (93%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/fragments/DiffFragmentImpl.java (96%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/fragments/LineFragment.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/fragments/LineFragmentImpl.java (98%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/fragments/MergeLineFragment.java (88%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/impl/DiffContentFactoryImpl.java (98%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/impl/DiffRequestFactoryImpl.java (87%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/requests/ContentDiffRequest.java (90%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/requests/DiffRequest.java (96%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/requests/LoadingDiffRequest.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/requests/MessageDiffRequest.java (96%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/requests/NoDiffRequest.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/requests/OperationCanceledDiffRequest.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/requests/SimpleDiffRequest.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/util/DiffPlaces.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/util/DiffUserDataKeys.java (98%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/util/Side.java (94%) rename platform/diff-api/src/com/intellij/{openapi/util => }/diff/util/ThreeSide.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/DiffManagerImpl.java (80%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/BaseShowDiffAction.java (89%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/BufferedLineIterator.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/CompareClipboardWithSelectionAction.java (89%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/CompareFileWithEditorAction.java (87%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/CompareFilesAction.java (94%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/DocumentFragmentContent.java (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/DocumentsSynchronizer.java (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/NavigationContextChecker.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/FocusOppositePaneAction.java (83%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/GoToChangePopupAction.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/GoToChangePopupBuilder.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/NextChangeAction.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/NextDifferenceAction.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/OpenInEditorAction.java (89%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/OpenInEditorWithMouseAction.java (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/PrevChangeAction.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/PrevDifferenceAction.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/SetEditorSettingsAction.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/actions/impl/ShowOldDiffAction.java (93%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/applications/ApplicationStarterBase.java (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/applications/DiffApplication.java (88%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/impl/CacheDiffRequestChainProcessor.java (90%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/impl/DiffRequestPanelImpl.java (91%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/impl/DiffRequestProcessor.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/impl/DiffViewerWrapper.java (80%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/impl/DiffWindow.java (88%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/impl/DiffWindowBase.java (92%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/impl/ModifiablePanel.java (96%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/requests/ErrorDiffRequest.java (94%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/settings/DiffSettingsConfigurable.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/settings/DiffSettingsPaneExternall.form (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/settings/DiffSettingsPanel.form (87%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/settings/DiffSettingsPanel.java (92%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/settings/ExternalDiffSettingsConfigurable.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/settings/ExternalDiffSettingsPanel.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/ErrorDiffTool.java (85%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/binary/BinaryContentPanel.java (90%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/binary/BinaryDiffPanel.java (89%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/binary/BinaryDiffTool.java (84%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/binary/BinaryDiffViewer.java (94%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/dir/DifDiffViewer.java (89%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/dir/DirDiffTool.java (80%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/external/ExternalDiffSettings.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/external/ExternalDiffTool.java (89%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/external/ExternalDiffToolUtil.java (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/ChangedBlock.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/HighlightRange.java (91%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/LineNumberConvertor.java (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/OnesideContentPanel.java (96%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/OnesideDiffChange.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/OnesideDiffPanel.java (91%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/OnesideDiffTool.java (84%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/OnesideDiffViewer.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/OnesideEditorHighlighter.java (99%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/OnesideEditorRangeHighlighter.java (99%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/fragmented/OnesideFragmentBuilder.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/simple/DiffOperation.java (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/simple/SimpleDiffChange.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/simple/SimpleDiffTool.java (86%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/simple/SimpleDiffViewer.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/simple/SimpleThreesideDiffChange.java (96%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/simple/SimpleThreesideDiffViewer.java (94%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/BaseSyncScrollable.java (96%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/DiffDataKeys.java (84%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/DiffSplitter.java (96%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/EditorsDiffPanelBase.java (90%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/FoldingModelSupport.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/LineFragmentCache.java (93%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/PrevNextDifferenceIterable.java (94%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/SoftHardCacheMap.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/StatusPanel.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/SyncScrollSupport.java (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/ThreeDiffSplitter.java (94%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/base/DiffPanelBase.java (96%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/base/DiffViewerBase.java (92%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/base/HighlightPolicy.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/base/IgnorePolicy.java (92%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/base/ListenerDiffViewerBase.java (91%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/base/TextDiffSettingsHolder.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/base/TextDiffViewerBase.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/threeside/ThreesideContentPanel.java (89%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/threeside/ThreesideTextContentPanel.java (94%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/threeside/ThreesideTextDiffPanel.java (87%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/threeside/ThreesideTextDiffViewer.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/twoside/TwosideContentPanel.java (94%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/twoside/TwosideTextContentPanel.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/twoside/TwosideTextDiffPanel.java (87%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/tools/util/twoside/TwosideTextDiffViewer.java (95%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/DiffDividerDrawUtil.java (99%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/DiffDrawUtil.java (99%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/DiffEmptyHighlighterRenderer.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/DiffLineMarkerRenderer.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/DiffLineSeparatorRenderer.java (99%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/DiffUserDataKeysEx.java (90%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/DiffUtil.java (96%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/TextDiffType.java (97%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/TextDiffTypeFactory.java (98%) rename platform/diff-impl/src/com/intellij/{openapi/util => }/diff/util/WaitingBackgroundableTaskExecutor.java (99%) rename platform/diff-impl/tests/com/intellij/{openapi/util => }/diff/comparison/AutoTestCase.java (97%) rename platform/diff-impl/tests/com/intellij/{openapi/util => }/diff/comparison/CharComparisonUtilTest.java (99%) rename platform/diff-impl/tests/com/intellij/{openapi/util => }/diff/comparison/ComparisonUtilAutoTest.java (98%) rename platform/diff-impl/tests/com/intellij/{openapi/util => }/diff/comparison/ComparisonUtilTestBase.java (99%) rename platform/diff-impl/tests/com/intellij/{openapi/util => }/diff/comparison/LineComparisonUtilTest.java (98%) rename platform/diff-impl/tests/com/intellij/{openapi/util => }/diff/comparison/SplitComparisonUtilTest.java (95%) rename platform/diff-impl/tests/com/intellij/{openapi/util => }/diff/comparison/WordComparisonUtilTest.java (99%) rename platform/diff-impl/tests/com/intellij/{openapi/util => }/diff/tools/fragmented/LineNumberConvertorTest.java (98%) diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java index 2505f04b5bfd..b1b7995b0972 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java @@ -17,11 +17,11 @@ package com.intellij.debugger.actions; import com.intellij.debugger.impl.DebuggerContextImpl; import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManager; +import com.intellij.diff.DiffRequestFactory; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.DiffRequestFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; /** * @author Jeka diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffContentFactory.java b/platform/diff-api/src/com/intellij/diff/DiffContentFactory.java similarity index 91% rename from platform/diff-api/src/com/intellij/openapi/util/diff/DiffContentFactory.java rename to platform/diff-api/src/com/intellij/diff/DiffContentFactory.java index 3b77062551ef..c64a5261b50b 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffContentFactory.java +++ b/platform/diff-api/src/com/intellij/diff/DiffContentFactory.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff; +package com.intellij.diff; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.contents.EmptyContent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.contents.EmptyContent; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.LineSeparator; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/api/DiffContext.java b/platform/diff-api/src/com/intellij/diff/DiffContext.java similarity index 95% rename from platform/diff-api/src/com/intellij/openapi/util/diff/api/DiffContext.java rename to platform/diff-api/src/com/intellij/diff/DiffContext.java index acd03dcbd381..72bdd4869fed 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/api/DiffContext.java +++ b/platform/diff-api/src/com/intellij/diff/DiffContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.api; +package com.intellij.diff; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolder; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffDialogHints.java b/platform/diff-api/src/com/intellij/diff/DiffDialogHints.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/DiffDialogHints.java rename to platform/diff-api/src/com/intellij/diff/DiffDialogHints.java index bb7751373f3b..e76432514840 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffDialogHints.java +++ b/platform/diff-api/src/com/intellij/diff/DiffDialogHints.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff; +package com.intellij.diff; import com.intellij.openapi.ui.WindowWrapper; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffManager.java b/platform/diff-api/src/com/intellij/diff/DiffManager.java similarity index 90% rename from platform/diff-api/src/com/intellij/openapi/util/diff/DiffManager.java rename to platform/diff-api/src/com/intellij/diff/DiffManager.java index bbf6e22fe8c9..a62544c73e98 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffManager.java +++ b/platform/diff-api/src/com/intellij/diff/DiffManager.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff; +package com.intellij.diff; +import com.intellij.diff.chains.DiffRequestChain; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.Disposable; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffManagerEx.java b/platform/diff-api/src/com/intellij/diff/DiffManagerEx.java similarity index 87% rename from platform/diff-api/src/com/intellij/openapi/util/diff/DiffManagerEx.java rename to platform/diff-api/src/com/intellij/diff/DiffManagerEx.java index a97bfb304c56..9eb68d09885b 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffManagerEx.java +++ b/platform/diff-api/src/com/intellij/diff/DiffManagerEx.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff; +package com.intellij.diff; +import com.intellij.diff.chains.DiffRequestChain; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.api.DiffTool; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffRequestFactory.java b/platform/diff-api/src/com/intellij/diff/DiffRequestFactory.java similarity index 93% rename from platform/diff-api/src/com/intellij/openapi/util/diff/DiffRequestFactory.java rename to platform/diff-api/src/com/intellij/diff/DiffRequestFactory.java index 8ea642f35415..636abe3290cf 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffRequestFactory.java +++ b/platform/diff-api/src/com/intellij/diff/DiffRequestFactory.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff; +package com.intellij.diff; +import com.intellij.diff.requests.ContentDiffRequest; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffRequestPanel.java b/platform/diff-api/src/com/intellij/diff/DiffRequestPanel.java similarity index 91% rename from platform/diff-api/src/com/intellij/openapi/util/diff/DiffRequestPanel.java rename to platform/diff-api/src/com/intellij/diff/DiffRequestPanel.java index 93726447c01b..f02b2472b5f8 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/DiffRequestPanel.java +++ b/platform/diff-api/src/com/intellij/diff/DiffRequestPanel.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff; +package com.intellij.diff; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/api/DiffTool.java b/platform/diff-api/src/com/intellij/diff/DiffTool.java similarity index 85% rename from platform/diff-api/src/com/intellij/openapi/util/diff/api/DiffTool.java rename to platform/diff-api/src/com/intellij/diff/DiffTool.java index 7c07d8474d0c..810894eba371 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/api/DiffTool.java +++ b/platform/diff-api/src/com/intellij/diff/DiffTool.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.api; +package com.intellij.diff; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.extensions.ExtensionPointName; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; public interface DiffTool { - ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.openapi.util.diff.api.DiffTool"); + ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.diff.DiffTool"); @NotNull String getName(); diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/api/FrameDiffTool.java b/platform/diff-api/src/com/intellij/diff/FrameDiffTool.java similarity index 93% rename from platform/diff-api/src/com/intellij/openapi/util/diff/api/FrameDiffTool.java rename to platform/diff-api/src/com/intellij/diff/FrameDiffTool.java index d8377f99c372..b25a29bb52de 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/api/FrameDiffTool.java +++ b/platform/diff-api/src/com/intellij/diff/FrameDiffTool.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.api; +package com.intellij.diff; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.AnAction; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/api/SuppressiveDiffTool.java b/platform/diff-api/src/com/intellij/diff/SuppressiveDiffTool.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/api/SuppressiveDiffTool.java rename to platform/diff-api/src/com/intellij/diff/SuppressiveDiffTool.java index 6ae1e59527b5..7a855e52efc9 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/api/SuppressiveDiffTool.java +++ b/platform/diff-api/src/com/intellij/diff/SuppressiveDiffTool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.api; +package com.intellij.diff; import java.util.List; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/chains/DiffRequestChain.java b/platform/diff-api/src/com/intellij/diff/chains/DiffRequestChain.java similarity index 95% rename from platform/diff-api/src/com/intellij/openapi/util/diff/chains/DiffRequestChain.java rename to platform/diff-api/src/com/intellij/diff/chains/DiffRequestChain.java index e7743ebedc8c..249860917e0e 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/chains/DiffRequestChain.java +++ b/platform/diff-api/src/com/intellij/diff/chains/DiffRequestChain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.chains; +package com.intellij.diff.chains; import com.intellij.openapi.util.UserDataHolder; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/chains/DiffRequestPresentable.java b/platform/diff-api/src/com/intellij/diff/chains/DiffRequestPresentable.java similarity index 91% rename from platform/diff-api/src/com/intellij/openapi/util/diff/chains/DiffRequestPresentable.java rename to platform/diff-api/src/com/intellij/diff/chains/DiffRequestPresentable.java index 4be581a7d682..5b52171aea69 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/chains/DiffRequestPresentable.java +++ b/platform/diff-api/src/com/intellij/diff/chains/DiffRequestPresentable.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.chains; +package com.intellij.diff.chains; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.intellij.lang.annotations.CalledInBackground; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/chains/DiffRequestPresentableException.java b/platform/diff-api/src/com/intellij/diff/chains/DiffRequestPresentableException.java similarity index 95% rename from platform/diff-api/src/com/intellij/openapi/util/diff/chains/DiffRequestPresentableException.java rename to platform/diff-api/src/com/intellij/diff/chains/DiffRequestPresentableException.java index 602c87b7440f..2e144a738abd 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/chains/DiffRequestPresentableException.java +++ b/platform/diff-api/src/com/intellij/diff/chains/DiffRequestPresentableException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.chains; +package com.intellij.diff.chains; public class DiffRequestPresentableException extends Exception { public DiffRequestPresentableException(Throwable cause) { diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/chains/SimpleDiffRequestChain.java b/platform/diff-api/src/com/intellij/diff/chains/SimpleDiffRequestChain.java similarity index 96% rename from platform/diff-api/src/com/intellij/openapi/util/diff/chains/SimpleDiffRequestChain.java rename to platform/diff-api/src/com/intellij/diff/chains/SimpleDiffRequestChain.java index c7598a4aa7dd..f62540bb1c9b 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/chains/SimpleDiffRequestChain.java +++ b/platform/diff-api/src/com/intellij/diff/chains/SimpleDiffRequestChain.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.chains; +package com.intellij.diff.chains; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.UserDataHolder; import com.intellij.openapi.util.UserDataHolderBase; -import com.intellij.openapi.util.diff.requests.DiffRequest; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ByChar.java b/platform/diff-api/src/com/intellij/diff/comparison/ByChar.java similarity index 96% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ByChar.java rename to platform/diff-api/src/com/intellij/diff/comparison/ByChar.java index 7a3a3d981754..8eb6f208a867 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ByChar.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/ByChar.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; +import com.intellij.diff.comparison.iterables.DiffIterable; +import com.intellij.diff.comparison.iterables.FairDiffIterable; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterable; -import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; -import static com.intellij.openapi.util.diff.comparison.TrimUtil.isPunctuation; -import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.*; +import static com.intellij.diff.comparison.TrimUtil.isPunctuation; +import static com.intellij.diff.comparison.iterables.DiffIterableUtil.*; import static com.intellij.openapi.util.text.StringUtil.isWhiteSpace; public class ByChar { diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ByLine.java b/platform/diff-api/src/com/intellij/diff/comparison/ByLine.java similarity index 93% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ByLine.java rename to platform/diff-api/src/com/intellij/diff/comparison/ByLine.java index 707d2d6f3337..8d5dac597c2d 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ByLine.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/ByLine.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.ChangeBuilder; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.IntPair; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.FairDiffIterable; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.fragments.LineFragmentImpl; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.ChangeBuilder; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.IntPair; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; -import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.fragments.LineFragmentImpl; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; @@ -29,10 +29,10 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; -import static com.intellij.openapi.util.diff.comparison.TrimUtil.trimEnd; -import static com.intellij.openapi.util.diff.comparison.TrimUtil.trimStart; -import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.diff; -import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.fair; +import static com.intellij.diff.comparison.TrimUtil.trimEnd; +import static com.intellij.diff.comparison.TrimUtil.trimStart; +import static com.intellij.diff.comparison.iterables.DiffIterableUtil.diff; +import static com.intellij.diff.comparison.iterables.DiffIterableUtil.fair; import static com.intellij.openapi.util.text.StringUtil.isWhiteSpace; public class ByLine { diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ByWord.java b/platform/diff-api/src/com/intellij/diff/comparison/ByWord.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ByWord.java rename to platform/diff-api/src/com/intellij/diff/comparison/ByWord.java index effb1055d27d..8d65a5e81fd9 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ByWord.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/ByWord.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; +import com.intellij.diff.comparison.LineFragmentSplitter.WordBlock; +import com.intellij.diff.comparison.iterables.DiffIterable; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.*; +import com.intellij.diff.comparison.iterables.FairDiffIterable; +import com.intellij.diff.fragments.DiffFragment; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.Couple; -import com.intellij.openapi.util.diff.comparison.LineFragmentSplitter.WordBlock; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterable; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.*; -import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable; -import com.intellij.openapi.util.diff.fragments.DiffFragment; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.text.MergingCharSequence; import org.jetbrains.annotations.NotNull; @@ -29,10 +29,10 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; -import static com.intellij.openapi.util.diff.comparison.TrimUtil.*; -import static com.intellij.openapi.util.diff.comparison.TrimUtil.trim; -import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.*; -import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.trim; +import static com.intellij.diff.comparison.TrimUtil.*; +import static com.intellij.diff.comparison.TrimUtil.trim; +import static com.intellij.diff.comparison.iterables.DiffIterableUtil.*; +import static com.intellij.diff.comparison.iterables.DiffIterableUtil.trim; import static com.intellij.openapi.util.text.StringUtil.isWhiteSpace; public class ByWord { diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ChangeCorrector.java b/platform/diff-api/src/com/intellij/diff/comparison/ChangeCorrector.java similarity index 89% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ChangeCorrector.java rename to platform/diff-api/src/com/intellij/diff/comparison/ChangeCorrector.java index 728a5c09b896..c63033ed3259 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ChangeCorrector.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/ChangeCorrector.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; +import com.intellij.diff.comparison.ByChar.Char; +import com.intellij.diff.comparison.ByLine.Line; +import com.intellij.diff.comparison.ByLine.LineWrapper; +import com.intellij.diff.comparison.iterables.DiffIterableUtil; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.FairDiffIterable; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.util.diff.comparison.ByChar.Char; -import com.intellij.openapi.util.diff.comparison.ByLine.Line; -import com.intellij.openapi.util.diff.comparison.ByLine.LineWrapper; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; -import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable; import org.jetbrains.annotations.NotNull; import java.util.List; -import static com.intellij.openapi.util.diff.comparison.TrimUtil.expand; -import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.diff; -import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.fair; +import static com.intellij.diff.comparison.TrimUtil.expand; +import static com.intellij.diff.comparison.iterables.DiffIterableUtil.diff; +import static com.intellij.diff.comparison.iterables.DiffIterableUtil.fair; /* * Base class for two-step diff algorithms. diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ComparisonPolicy.java b/platform/diff-api/src/com/intellij/diff/comparison/ComparisonPolicy.java similarity index 93% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ComparisonPolicy.java rename to platform/diff-api/src/com/intellij/diff/comparison/ComparisonPolicy.java index 2490b9e44770..9c27db94b08e 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ComparisonPolicy.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/ComparisonPolicy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; public enum ComparisonPolicy { DEFAULT, diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ComparisonUtil.java b/platform/diff-api/src/com/intellij/diff/comparison/ComparisonUtil.java similarity index 96% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ComparisonUtil.java rename to platform/diff-api/src/com/intellij/diff/comparison/ComparisonUtil.java index ced196e29252..0aeefac50726 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/ComparisonUtil.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/ComparisonUtil.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.DiffFragmentImpl; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.fragments.LineFragmentImpl; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.fragments.DiffFragmentImpl; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.fragments.LineFragmentImpl; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Consumer; import com.intellij.util.containers.ContainerUtil; @@ -32,7 +32,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.convertIntoFragments; +import static com.intellij.diff.comparison.iterables.DiffIterableUtil.convertIntoFragments; /** * Class for the text comparison diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/DiffTooBigException.java b/platform/diff-api/src/com/intellij/diff/comparison/DiffTooBigException.java similarity index 95% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/DiffTooBigException.java rename to platform/diff-api/src/com/intellij/diff/comparison/DiffTooBigException.java index e48b85c5caf4..fca771012ad9 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/DiffTooBigException.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/DiffTooBigException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; import com.intellij.openapi.progress.ProcessCanceledException; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/LineFragmentSplitter.java b/platform/diff-api/src/com/intellij/diff/comparison/LineFragmentSplitter.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/LineFragmentSplitter.java rename to platform/diff-api/src/com/intellij/diff/comparison/LineFragmentSplitter.java index 3a62da61a4d5..fc869a84af58 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/LineFragmentSplitter.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/LineFragmentSplitter.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; +import com.intellij.diff.comparison.ByWord.InlineChunk; +import com.intellij.diff.comparison.ByWord.NewlineChunk; +import com.intellij.diff.comparison.iterables.DiffIterableUtil; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.FairDiffIterable; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.util.diff.comparison.ByWord.InlineChunk; -import com.intellij.openapi.util.diff.comparison.ByWord.NewlineChunk; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; -import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/MergeUtil.java b/platform/diff-api/src/com/intellij/diff/comparison/MergeUtil.java similarity index 95% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/MergeUtil.java rename to platform/diff-api/src/com/intellij/diff/comparison/MergeUtil.java index 1fea4de299ee..297345cf1f8b 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/MergeUtil.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/MergeUtil.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.FairDiffIterable; +import com.intellij.diff.fragments.MergeLineFragment; +import com.intellij.diff.util.Side; +import com.intellij.diff.util.ThreeSide; import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; -import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable; -import com.intellij.openapi.util.diff.fragments.MergeLineFragment; -import com.intellij.openapi.util.diff.util.Side; -import com.intellij.openapi.util.diff.util.ThreeSide; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/TextChunk.java b/platform/diff-api/src/com/intellij/diff/comparison/TextChunk.java similarity index 96% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/TextChunk.java rename to platform/diff-api/src/com/intellij/diff/comparison/TextChunk.java index ffe4eab64ad8..b6d9ccbb0c99 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/TextChunk.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/TextChunk.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/TrimUtil.java b/platform/diff-api/src/com/intellij/diff/comparison/TrimUtil.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/TrimUtil.java rename to platform/diff-api/src/com/intellij/diff/comparison/TrimUtil.java index e194a3a05c98..d89744028ed1 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/TrimUtil.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/TrimUtil.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.IntPair; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.IntPair; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; import gnu.trove.TIntHashSet; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/ChangeDiffIterableBase.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/ChangeDiffIterableBase.java similarity index 95% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/ChangeDiffIterableBase.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/ChangeDiffIterableBase.java index 2d8f0651a33d..69389c8259d6 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/ChangeDiffIterableBase.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/ChangeDiffIterableBase.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; import org.jetbrains.annotations.NotNull; import java.util.Iterator; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffChangeDiffIterable.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffChangeDiffIterable.java similarity index 96% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffChangeDiffIterable.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffChangeDiffIterable.java index 0733a663219c..58c1a1d754d0 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffChangeDiffIterable.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffChangeDiffIterable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; import com.intellij.util.diff.Diff; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffFragmentsDiffIterable.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffFragmentsDiffIterable.java similarity index 93% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffFragmentsDiffIterable.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffFragmentsDiffIterable.java index 1154cd686778..a977b5c86dab 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffFragmentsDiffIterable.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffFragmentsDiffIterable.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; -import com.intellij.openapi.util.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.DiffFragment; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffIterable.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterable.java similarity index 87% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffIterable.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterable.java index ee4f9b42d155..c10cf6c73ffb 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffIterable.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterable.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; import org.jetbrains.annotations.NotNull; import java.util.Iterator; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffIterableBase.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterableBase.java similarity index 90% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffIterableBase.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterableBase.java index 313983273537..f004ac110579 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffIterableBase.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterableBase.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; import org.jetbrains.annotations.NotNull; import java.util.Iterator; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffIterableUtil.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffIterableUtil.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java index a787053fcfe5..0ab7216d3c0f 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/DiffIterableUtil.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; +import com.intellij.diff.comparison.DiffTooBigException; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.DiffFragmentImpl; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.comparison.DiffTooBigException; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.fragments.DiffFragmentImpl; import com.intellij.openapi.util.registry.Registry; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.diff.Diff; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/FairDiffIterable.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/FairDiffIterable.java similarity index 92% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/FairDiffIterable.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/FairDiffIterable.java index dba84221797c..94f04eeeade2 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/FairDiffIterable.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/FairDiffIterable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; /* * Matched fragments are guaranteed to have same length diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/FairDiffIterableWrapper.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/FairDiffIterableWrapper.java similarity index 90% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/FairDiffIterableWrapper.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/FairDiffIterableWrapper.java index a29e755d9a24..ce0bfaf2fe49 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/FairDiffIterableWrapper.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/FairDiffIterableWrapper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; import org.jetbrains.annotations.NotNull; import java.util.Iterator; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/InvertedDiffIterableWrapper.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/InvertedDiffIterableWrapper.java similarity index 89% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/InvertedDiffIterableWrapper.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/InvertedDiffIterableWrapper.java index 2f82e502e06d..13fc000be0a1 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/InvertedDiffIterableWrapper.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/InvertedDiffIterableWrapper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; import org.jetbrains.annotations.NotNull; import java.util.Iterator; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/RangesDiffIterable.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/RangesDiffIterable.java similarity index 92% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/RangesDiffIterable.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/RangesDiffIterable.java index b8213b9ada98..a0692cb42dd8 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/RangesDiffIterable.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/RangesDiffIterable.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; import org.jetbrains.annotations.NotNull; import java.util.List; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/SubiterableDiffIterable.java b/platform/diff-api/src/com/intellij/diff/comparison/iterables/SubiterableDiffIterable.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/SubiterableDiffIterable.java rename to platform/diff-api/src/com/intellij/diff/comparison/iterables/SubiterableDiffIterable.java index c9d0899f71f8..9e6974f5f68a 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/comparison/iterables/SubiterableDiffIterable.java +++ b/platform/diff-api/src/com/intellij/diff/comparison/iterables/SubiterableDiffIterable.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison.iterables; +package com.intellij.diff.comparison.iterables; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range; import org.jetbrains.annotations.NotNull; import java.util.Iterator; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/BinaryFileContent.java b/platform/diff-api/src/com/intellij/diff/contents/BinaryFileContent.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/BinaryFileContent.java rename to platform/diff-api/src/com/intellij/diff/contents/BinaryFileContent.java index 4861484c8e52..b65e55b01c81 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/BinaryFileContent.java +++ b/platform/diff-api/src/com/intellij/diff/contents/BinaryFileContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/BinaryFileContentImpl.java b/platform/diff-api/src/com/intellij/diff/contents/BinaryFileContentImpl.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/BinaryFileContentImpl.java rename to platform/diff-api/src/com/intellij/diff/contents/BinaryFileContentImpl.java index 264ae1129570..e61040b1c67a 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/BinaryFileContentImpl.java +++ b/platform/diff-api/src/com/intellij/diff/contents/BinaryFileContentImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileTypes.FileType; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DiffContent.java b/platform/diff-api/src/com/intellij/diff/contents/DiffContent.java similarity index 91% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/DiffContent.java rename to platform/diff-api/src/com/intellij/diff/contents/DiffContent.java index a6e13c87e175..8efc716a2186 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DiffContent.java +++ b/platform/diff-api/src/com/intellij/diff/contents/DiffContent.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileTypes.FileType; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DirectoryContent.java b/platform/diff-api/src/com/intellij/diff/contents/DirectoryContent.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/DirectoryContent.java rename to platform/diff-api/src/com/intellij/diff/contents/DirectoryContent.java index 0eaac1530fcc..f54eaf266ea9 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DirectoryContent.java +++ b/platform/diff-api/src/com/intellij/diff/contents/DirectoryContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DirectoryContentImpl.java b/platform/diff-api/src/com/intellij/diff/contents/DirectoryContentImpl.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/DirectoryContentImpl.java rename to platform/diff-api/src/com/intellij/diff/contents/DirectoryContentImpl.java index 531ffbfcb770..b59154fb3956 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DirectoryContentImpl.java +++ b/platform/diff-api/src/com/intellij/diff/contents/DirectoryContentImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileTypes.FileType; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DocumentContent.java b/platform/diff-api/src/com/intellij/diff/contents/DocumentContent.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/DocumentContent.java rename to platform/diff-api/src/com/intellij/diff/contents/DocumentContent.java index fe82e46f8d57..0a86d5e64ea6 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DocumentContent.java +++ b/platform/diff-api/src/com/intellij/diff/contents/DocumentContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileEditor.OpenFileDescriptor; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DocumentContentImpl.java b/platform/diff-api/src/com/intellij/diff/contents/DocumentContentImpl.java similarity index 98% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/DocumentContentImpl.java rename to platform/diff-api/src/com/intellij/diff/contents/DocumentContentImpl.java index 5a22adbcfeac..26c3d977e89a 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DocumentContentImpl.java +++ b/platform/diff-api/src/com/intellij/diff/contents/DocumentContentImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileEditor.OpenFileDescriptor; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DocumentContentWrapper.java b/platform/diff-api/src/com/intellij/diff/contents/DocumentContentWrapper.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/DocumentContentWrapper.java rename to platform/diff-api/src/com/intellij/diff/contents/DocumentContentWrapper.java index 83a3dc5578c4..82f87e06ee40 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/DocumentContentWrapper.java +++ b/platform/diff-api/src/com/intellij/diff/contents/DocumentContentWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.EditorFactory; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/EmptyContent.java b/platform/diff-api/src/com/intellij/diff/contents/EmptyContent.java similarity index 95% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/EmptyContent.java rename to platform/diff-api/src/com/intellij/diff/contents/EmptyContent.java index add10dfb91b3..65013071d204 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/EmptyContent.java +++ b/platform/diff-api/src/com/intellij/diff/contents/EmptyContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileTypes.FileType; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/FileContent.java b/platform/diff-api/src/com/intellij/diff/contents/FileContent.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/FileContent.java rename to platform/diff-api/src/com/intellij/diff/contents/FileContent.java index 1b417dbdcb2a..55787ec6dc13 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/FileContent.java +++ b/platform/diff-api/src/com/intellij/diff/contents/FileContent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/FileDocumentContentImpl.java b/platform/diff-api/src/com/intellij/diff/contents/FileDocumentContentImpl.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/FileDocumentContentImpl.java rename to platform/diff-api/src/com/intellij/diff/contents/FileDocumentContentImpl.java index b01f2c254d91..cccce658ad3f 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/FileDocumentContentImpl.java +++ b/platform/diff-api/src/com/intellij/diff/contents/FileDocumentContentImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileEditor.OpenFileDescriptor; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/SimpleContentBuilder.java b/platform/diff-api/src/com/intellij/diff/contents/SimpleContentBuilder.java similarity index 98% rename from platform/diff-api/src/com/intellij/openapi/util/diff/contents/SimpleContentBuilder.java rename to platform/diff-api/src/com/intellij/diff/contents/SimpleContentBuilder.java index c6290497a831..1d00a78129a3 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/contents/SimpleContentBuilder.java +++ b/platform/diff-api/src/com/intellij/diff/contents/SimpleContentBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.contents; +package com.intellij.diff.contents; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.EditorFactory; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/DiffFragment.java b/platform/diff-api/src/com/intellij/diff/fragments/DiffFragment.java similarity index 93% rename from platform/diff-api/src/com/intellij/openapi/util/diff/fragments/DiffFragment.java rename to platform/diff-api/src/com/intellij/diff/fragments/DiffFragment.java index db0dfb3413b4..a208a0b6aefc 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/DiffFragment.java +++ b/platform/diff-api/src/com/intellij/diff/fragments/DiffFragment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.fragments; +package com.intellij.diff.fragments; public interface DiffFragment { int getStartOffset1(); diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/DiffFragmentImpl.java b/platform/diff-api/src/com/intellij/diff/fragments/DiffFragmentImpl.java similarity index 96% rename from platform/diff-api/src/com/intellij/openapi/util/diff/fragments/DiffFragmentImpl.java rename to platform/diff-api/src/com/intellij/diff/fragments/DiffFragmentImpl.java index 78e2308f08e7..3a152a7c417f 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/DiffFragmentImpl.java +++ b/platform/diff-api/src/com/intellij/diff/fragments/DiffFragmentImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.fragments; +package com.intellij.diff.fragments; public class DiffFragmentImpl implements DiffFragment { private final int myStartOffset1; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/LineFragment.java b/platform/diff-api/src/com/intellij/diff/fragments/LineFragment.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/fragments/LineFragment.java rename to platform/diff-api/src/com/intellij/diff/fragments/LineFragment.java index 50ececaefa51..ad5e391e6bba 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/LineFragment.java +++ b/platform/diff-api/src/com/intellij/diff/fragments/LineFragment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.fragments; +package com.intellij.diff.fragments; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/LineFragmentImpl.java b/platform/diff-api/src/com/intellij/diff/fragments/LineFragmentImpl.java similarity index 98% rename from platform/diff-api/src/com/intellij/openapi/util/diff/fragments/LineFragmentImpl.java rename to platform/diff-api/src/com/intellij/diff/fragments/LineFragmentImpl.java index 438d35c9dc34..1b37fe8f9ee0 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/LineFragmentImpl.java +++ b/platform/diff-api/src/com/intellij/diff/fragments/LineFragmentImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.fragments; +package com.intellij.diff.fragments; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/MergeLineFragment.java b/platform/diff-api/src/com/intellij/diff/fragments/MergeLineFragment.java similarity index 88% rename from platform/diff-api/src/com/intellij/openapi/util/diff/fragments/MergeLineFragment.java rename to platform/diff-api/src/com/intellij/diff/fragments/MergeLineFragment.java index 33121599fb36..9b89baaef812 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/fragments/MergeLineFragment.java +++ b/platform/diff-api/src/com/intellij/diff/fragments/MergeLineFragment.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.fragments; +package com.intellij.diff.fragments; -import com.intellij.openapi.util.diff.util.ThreeSide; +import com.intellij.diff.util.ThreeSide; import org.jetbrains.annotations.NotNull; public interface MergeLineFragment { diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/impl/DiffContentFactoryImpl.java b/platform/diff-api/src/com/intellij/diff/impl/DiffContentFactoryImpl.java similarity index 98% rename from platform/diff-api/src/com/intellij/openapi/util/diff/impl/DiffContentFactoryImpl.java rename to platform/diff-api/src/com/intellij/diff/impl/DiffContentFactoryImpl.java index b226d1843430..08083ef6a1dd 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/impl/DiffContentFactoryImpl.java +++ b/platform/diff-api/src/com/intellij/diff/impl/DiffContentFactoryImpl.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.impl; +package com.intellij.diff.impl; +import com.intellij.diff.DiffContentFactory; +import com.intellij.diff.contents.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; @@ -26,8 +28,6 @@ import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.contents.*; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtil; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/impl/DiffRequestFactoryImpl.java b/platform/diff-api/src/com/intellij/diff/impl/DiffRequestFactoryImpl.java similarity index 87% rename from platform/diff-api/src/com/intellij/openapi/util/diff/impl/DiffRequestFactoryImpl.java rename to platform/diff-api/src/com/intellij/diff/impl/DiffRequestFactoryImpl.java index de10806b1ebf..135423672cdb 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/impl/DiffRequestFactoryImpl.java +++ b/platform/diff-api/src/com/intellij/diff/impl/DiffRequestFactoryImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.impl; +package com.intellij.diff.impl; +import com.intellij.diff.DiffContentFactory; +import com.intellij.diff.DiffRequestFactory; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.DiffRequestFactory; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/ContentDiffRequest.java b/platform/diff-api/src/com/intellij/diff/requests/ContentDiffRequest.java similarity index 90% rename from platform/diff-api/src/com/intellij/openapi/util/diff/requests/ContentDiffRequest.java rename to platform/diff-api/src/com/intellij/diff/requests/ContentDiffRequest.java index 3b5036725355..d83308b8d0e4 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/ContentDiffRequest.java +++ b/platform/diff-api/src/com/intellij/diff/requests/ContentDiffRequest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.requests; +package com.intellij.diff.requests; -import com.intellij.openapi.util.diff.contents.DiffContent; +import com.intellij.diff.contents.DiffContent; import org.jetbrains.annotations.NotNull; /** diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/DiffRequest.java b/platform/diff-api/src/com/intellij/diff/requests/DiffRequest.java similarity index 96% rename from platform/diff-api/src/com/intellij/openapi/util/diff/requests/DiffRequest.java rename to platform/diff-api/src/com/intellij/diff/requests/DiffRequest.java index 01f488d47628..22afe1c375a7 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/DiffRequest.java +++ b/platform/diff-api/src/com/intellij/diff/requests/DiffRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.requests; +package com.intellij.diff.requests; import com.intellij.openapi.util.UserDataHolderBase; import org.intellij.lang.annotations.CalledInAwt; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/LoadingDiffRequest.java b/platform/diff-api/src/com/intellij/diff/requests/LoadingDiffRequest.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/requests/LoadingDiffRequest.java rename to platform/diff-api/src/com/intellij/diff/requests/LoadingDiffRequest.java index 151657874bdc..c206b48bc047 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/LoadingDiffRequest.java +++ b/platform/diff-api/src/com/intellij/diff/requests/LoadingDiffRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.requests; +package com.intellij.diff.requests; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/MessageDiffRequest.java b/platform/diff-api/src/com/intellij/diff/requests/MessageDiffRequest.java similarity index 96% rename from platform/diff-api/src/com/intellij/openapi/util/diff/requests/MessageDiffRequest.java rename to platform/diff-api/src/com/intellij/diff/requests/MessageDiffRequest.java index d1667d713e4c..8e4c9f1a10c7 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/MessageDiffRequest.java +++ b/platform/diff-api/src/com/intellij/diff/requests/MessageDiffRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.requests; +package com.intellij.diff.requests; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/NoDiffRequest.java b/platform/diff-api/src/com/intellij/diff/requests/NoDiffRequest.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/requests/NoDiffRequest.java rename to platform/diff-api/src/com/intellij/diff/requests/NoDiffRequest.java index 96983a4706a1..fd5e42a8bb51 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/NoDiffRequest.java +++ b/platform/diff-api/src/com/intellij/diff/requests/NoDiffRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.requests; +package com.intellij.diff.requests; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/OperationCanceledDiffRequest.java b/platform/diff-api/src/com/intellij/diff/requests/OperationCanceledDiffRequest.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/requests/OperationCanceledDiffRequest.java rename to platform/diff-api/src/com/intellij/diff/requests/OperationCanceledDiffRequest.java index 19659b871ce1..764d967aa871 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/OperationCanceledDiffRequest.java +++ b/platform/diff-api/src/com/intellij/diff/requests/OperationCanceledDiffRequest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.requests; +package com.intellij.diff.requests; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/SimpleDiffRequest.java b/platform/diff-api/src/com/intellij/diff/requests/SimpleDiffRequest.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/requests/SimpleDiffRequest.java rename to platform/diff-api/src/com/intellij/diff/requests/SimpleDiffRequest.java index 601f142f8b5f..a25683499882 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/requests/SimpleDiffRequest.java +++ b/platform/diff-api/src/com/intellij/diff/requests/SimpleDiffRequest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.requests; +package com.intellij.diff.requests; -import com.intellij.openapi.util.diff.contents.DiffContent; +import com.intellij.diff.contents.DiffContent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/util/DiffPlaces.java b/platform/diff-api/src/com/intellij/diff/util/DiffPlaces.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/util/DiffPlaces.java rename to platform/diff-api/src/com/intellij/diff/util/DiffPlaces.java index bbf651eb9fa3..b3d67b8dd21a 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/util/DiffPlaces.java +++ b/platform/diff-api/src/com/intellij/diff/util/DiffPlaces.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; public interface DiffPlaces { String DEFAULT = "Default"; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/util/DiffUserDataKeys.java b/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java similarity index 98% rename from platform/diff-api/src/com/intellij/openapi/util/diff/util/DiffUserDataKeys.java rename to platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java index f6e893ecbf2e..b8fa447766a6 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/util/DiffUserDataKeys.java +++ b/platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.DataProvider; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/util/Side.java b/platform/diff-api/src/com/intellij/diff/util/Side.java similarity index 94% rename from platform/diff-api/src/com/intellij/openapi/util/diff/util/Side.java rename to platform/diff-api/src/com/intellij/diff/util/Side.java index b2e394605f6f..ce18e2832ae6 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/util/Side.java +++ b/platform/diff-api/src/com/intellij/diff/util/Side.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.LineFragment; import com.intellij.openapi.util.Couple; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.fragments.LineFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-api/src/com/intellij/openapi/util/diff/util/ThreeSide.java b/platform/diff-api/src/com/intellij/diff/util/ThreeSide.java similarity index 97% rename from platform/diff-api/src/com/intellij/openapi/util/diff/util/ThreeSide.java rename to platform/diff-api/src/com/intellij/diff/util/ThreeSide.java index 5be4ea8e857a..4defc2458c4a 100644 --- a/platform/diff-api/src/com/intellij/openapi/util/diff/util/ThreeSide.java +++ b/platform/diff-api/src/com/intellij/diff/util/ThreeSide.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/DiffManagerImpl.java b/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java similarity index 80% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/DiffManagerImpl.java rename to platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java index 3fb6a8c24223..a2c7ed87b2ce 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/DiffManagerImpl.java +++ b/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java @@ -13,23 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff; +package com.intellij.diff; +import com.intellij.diff.chains.DiffRequestChain; +import com.intellij.diff.chains.SimpleDiffRequestChain; +import com.intellij.diff.impl.DiffRequestPanelImpl; +import com.intellij.diff.impl.DiffWindow; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.tools.binary.BinaryDiffTool; +import com.intellij.diff.tools.dir.DirDiffTool; +import com.intellij.diff.tools.external.ExternalDiffTool; +import com.intellij.diff.tools.fragmented.OnesideDiffTool; +import com.intellij.diff.tools.simple.SimpleDiffTool; import com.intellij.openapi.Disposable; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.diff.api.DiffTool; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; -import com.intellij.openapi.util.diff.chains.SimpleDiffRequestChain; -import com.intellij.openapi.util.diff.impl.DiffRequestPanelImpl; -import com.intellij.openapi.util.diff.impl.DiffWindow; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.tools.binary.BinaryDiffTool; -import com.intellij.openapi.util.diff.tools.dir.DirDiffTool; -import com.intellij.openapi.util.diff.tools.external.ExternalDiffTool; -import com.intellij.openapi.util.diff.tools.fragmented.OnesideDiffTool; -import com.intellij.openapi.util.diff.tools.simple.SimpleDiffTool; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/BaseShowDiffAction.java b/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java similarity index 89% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/BaseShowDiffAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java index 88078dc06c7e..1c8f8caecfa6 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/BaseShowDiffAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions; +package com.intellij.diff.actions; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManager; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/BufferedLineIterator.java b/platform/diff-impl/src/com/intellij/diff/actions/BufferedLineIterator.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/BufferedLineIterator.java rename to platform/diff-impl/src/com/intellij/diff/actions/BufferedLineIterator.java index 4a5fce17802b..f69ee836b6c3 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/BufferedLineIterator.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/BufferedLineIterator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions; +package com.intellij.diff.actions; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/CompareClipboardWithSelectionAction.java b/platform/diff-impl/src/com/intellij/diff/actions/CompareClipboardWithSelectionAction.java similarity index 89% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/CompareClipboardWithSelectionAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/CompareClipboardWithSelectionAction.java index 05eb3d3d9277..347988345036 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/CompareClipboardWithSelectionAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/CompareClipboardWithSelectionAction.java @@ -13,8 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions; +package com.intellij.diff.actions; +import com.intellij.diff.DiffContentFactory; +import com.intellij.diff.DiffRequestFactory; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; +import com.intellij.diff.util.DiffUserDataKeys; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.diff.DiffBundle; @@ -24,12 +30,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.DiffRequestFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/CompareFileWithEditorAction.java b/platform/diff-impl/src/com/intellij/diff/actions/CompareFileWithEditorAction.java similarity index 87% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/CompareFileWithEditorAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/CompareFileWithEditorAction.java index 21816c07f4a6..c7b639d842eb 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/CompareFileWithEditorAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/CompareFileWithEditorAction.java @@ -13,8 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions; +package com.intellij.diff.actions; +import com.intellij.diff.DiffRequestFactory; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.Side; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.editor.Editor; @@ -22,13 +29,6 @@ import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.DiffRequestFactory; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.Side; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/CompareFilesAction.java b/platform/diff-impl/src/com/intellij/diff/actions/CompareFilesAction.java similarity index 94% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/CompareFilesAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/CompareFilesAction.java index d55504cc6365..dee1e8fe4738 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/CompareFilesAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/CompareFilesAction.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions; +package com.intellij.diff.actions; +import com.intellij.diff.DiffRequestFactory; +import com.intellij.diff.requests.DiffRequest; import com.intellij.ide.highlighter.ArchiveFileType; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; @@ -22,8 +24,6 @@ import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.DiffRequestFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/DocumentFragmentContent.java b/platform/diff-impl/src/com/intellij/diff/actions/DocumentFragmentContent.java similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/DocumentFragmentContent.java rename to platform/diff-impl/src/com/intellij/diff/actions/DocumentFragmentContent.java index 3254356ef945..1d1eab08c60e 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/DocumentFragmentContent.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/DocumentFragmentContent.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions; +package com.intellij.diff.actions; +import com.intellij.diff.contents.DocumentContent; import com.intellij.openapi.diff.FragmentContent; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.EditorFactory; @@ -25,7 +26,6 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.util.diff.contents.DocumentContent; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.LineSeparator; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/DocumentsSynchronizer.java b/platform/diff-impl/src/com/intellij/diff/actions/DocumentsSynchronizer.java similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/DocumentsSynchronizer.java rename to platform/diff-impl/src/com/intellij/diff/actions/DocumentsSynchronizer.java index 65c8fcdd1c6f..f0b9c96a2313 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/DocumentsSynchronizer.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/DocumentsSynchronizer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions; +package com.intellij.diff.actions; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/NavigationContextChecker.java b/platform/diff-impl/src/com/intellij/diff/actions/NavigationContextChecker.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/NavigationContextChecker.java rename to platform/diff-impl/src/com/intellij/diff/actions/NavigationContextChecker.java index 25fccddc8d00..e9002bd31dea 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/NavigationContextChecker.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/NavigationContextChecker.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions; +package com.intellij.diff.actions; import com.intellij.openapi.diff.DiffNavigationContext; import com.intellij.openapi.util.Pair; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/FocusOppositePaneAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/FocusOppositePaneAction.java similarity index 83% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/FocusOppositePaneAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/FocusOppositePaneAction.java index 0d6368e71cb2..84e99cc783b9 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/FocusOppositePaneAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/FocusOppositePaneAction.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; import com.intellij.openapi.Disposable; -import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CustomShortcutSet; +import com.intellij.openapi.actionSystem.ShortcutSet; import com.intellij.openapi.project.DumbAware; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/GoToChangePopupAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupAction.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/GoToChangePopupAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupAction.java index e77a0335f555..2ee469d123a7 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/GoToChangePopupAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/GoToChangePopupBuilder.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupBuilder.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/GoToChangePopupBuilder.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupBuilder.java index 894345feffd0..4d34f50c8ec2 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/GoToChangePopupBuilder.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupBuilder.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; +import com.intellij.diff.chains.DiffRequestChain; +import com.intellij.diff.chains.DiffRequestPresentable; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; @@ -22,8 +24,6 @@ import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.PopupStep; import com.intellij.openapi.ui.popup.util.BaseListPopupStep; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentable; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.Consumer; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/NextChangeAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/NextChangeAction.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/NextChangeAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/NextChangeAction.java index 5bda1f869185..8eaf6c84e81c 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/NextChangeAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/NextChangeAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/NextDifferenceAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/NextDifferenceAction.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/NextDifferenceAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/NextDifferenceAction.java index 56ecd29752a0..c4735d2e6e13 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/NextDifferenceAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/NextDifferenceAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/OpenInEditorAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorAction.java similarity index 89% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/OpenInEditorAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorAction.java index 12d4db89202d..77dd3971d772 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/OpenInEditorAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorAction.java @@ -13,8 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; +import com.intellij.diff.DiffContext; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.tools.util.DiffDataKeys; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUtil; import com.intellij.ide.actions.EditSourceAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; @@ -24,11 +29,6 @@ import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.tools.util.DiffDataKeys; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/OpenInEditorWithMouseAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorWithMouseAction.java similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/OpenInEditorWithMouseAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorWithMouseAction.java index 7140b89d1844..28185b79261f 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/OpenInEditorWithMouseAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorWithMouseAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.editor.Editor; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/PrevChangeAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/PrevChangeAction.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/PrevChangeAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/PrevChangeAction.java index 8866517f5195..2d53ad5cf445 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/PrevChangeAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/PrevChangeAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/PrevDifferenceAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/PrevDifferenceAction.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/PrevDifferenceAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/PrevDifferenceAction.java index aa42b66cfe6d..b73916c6c37d 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/PrevDifferenceAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/PrevDifferenceAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/SetEditorSettingsAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/SetEditorSettingsAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java index 4b4273d1a1e3..fc2a3ab2050f 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/SetEditorSettingsAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; +import com.intellij.diff.tools.util.base.TextDiffSettingsHolder; import com.intellij.icons.AllIcons; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.ActionGroup; @@ -23,7 +24,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.diff.tools.util.base.TextDiffSettingsHolder; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/ShowOldDiffAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/ShowOldDiffAction.java similarity index 93% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/ShowOldDiffAction.java rename to platform/diff-impl/src/com/intellij/diff/actions/impl/ShowOldDiffAction.java index 52ef4876eac0..6fd85571cf03 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/actions/impl/ShowOldDiffAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/ShowOldDiffAction.java @@ -13,8 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.actions.impl; +package com.intellij.diff.actions.impl; +import com.intellij.diff.contents.*; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.tools.util.DiffDataKeys; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; @@ -24,10 +28,6 @@ import com.intellij.openapi.diff.SimpleDiffRequest; import com.intellij.openapi.editor.Document; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.contents.*; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.tools.util.DiffDataKeys; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/applications/ApplicationStarterBase.java b/platform/diff-impl/src/com/intellij/diff/applications/ApplicationStarterBase.java similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/applications/ApplicationStarterBase.java rename to platform/diff-impl/src/com/intellij/diff/applications/ApplicationStarterBase.java index 311c7d137140..0e60ab08a3c8 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/applications/ApplicationStarterBase.java +++ b/platform/diff-impl/src/com/intellij/diff/applications/ApplicationStarterBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.applications; +package com.intellij.diff.applications; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationStarterEx; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/applications/DiffApplication.java b/platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java similarity index 88% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/applications/DiffApplication.java rename to platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java index e85aa3de6158..cbf495353809 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/applications/DiffApplication.java +++ b/platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.applications; +package com.intellij.diff.applications; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManagerEx; +import com.intellij.diff.DiffRequestFactory; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.diff.DiffBundle; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManagerEx; -import com.intellij.openapi.util.diff.DiffRequestFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/CacheDiffRequestChainProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestChainProcessor.java similarity index 90% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/impl/CacheDiffRequestChainProcessor.java rename to platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestChainProcessor.java index 5801b78f6cf2..a27af7b83d03 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/CacheDiffRequestChainProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestChainProcessor.java @@ -13,8 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.impl; +package com.intellij.diff.impl; +import com.intellij.diff.actions.impl.GoToChangePopupBuilder; +import com.intellij.diff.chains.DiffRequestChain; +import com.intellij.diff.chains.DiffRequestPresentable; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.requests.*; +import com.intellij.diff.tools.util.SoftHardCacheMap; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy; +import com.intellij.diff.util.WaitingBackgroundableTaskExecutor; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -24,19 +33,10 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.util.ProgressWindow; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.actions.impl.GoToChangePopupBuilder; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentable; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.requests.*; -import com.intellij.openapi.util.diff.tools.util.SoftHardCacheMap; -import org.intellij.lang.annotations.CalledInBackground; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy; -import com.intellij.openapi.util.diff.util.WaitingBackgroundableTaskExecutor; import com.intellij.util.Consumer; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Convertor; +import org.intellij.lang.annotations.CalledInBackground; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffRequestPanelImpl.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestPanelImpl.java similarity index 91% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffRequestPanelImpl.java rename to platform/diff-impl/src/com/intellij/diff/impl/DiffRequestPanelImpl.java index e27bfd669a85..6878b17dbe3a 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffRequestPanelImpl.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestPanelImpl.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.impl; +package com.intellij.diff.impl; +import com.intellij.diff.DiffRequestPanel; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.NoDiffRequest; +import com.intellij.diff.util.DiffUserDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.diff.DiffRequestPanel; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.NoDiffRequest; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffRequestProcessor.java rename to platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java index 1a2043377e17..1a42bb38fbd0 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java @@ -13,8 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.impl; +package com.intellij.diff.impl; +import com.intellij.diff.DiffContext; +import com.intellij.diff.DiffManagerEx; +import com.intellij.diff.DiffTool; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.FrameDiffTool.DiffViewer; +import com.intellij.diff.actions.impl.*; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.ErrorDiffRequest; +import com.intellij.diff.requests.MessageDiffRequest; +import com.intellij.diff.requests.NoDiffRequest; +import com.intellij.diff.tools.ErrorDiffTool; +import com.intellij.diff.tools.external.ExternalDiffTool; +import com.intellij.diff.tools.util.DiffDataKeys; +import com.intellij.diff.tools.util.PrevNextDifferenceIterable; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy; +import com.intellij.diff.util.DiffUserDataKeysEx; +import com.intellij.diff.util.DiffUtil; import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; @@ -30,28 +48,10 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.UserDataHolder; import com.intellij.openapi.util.UserDataHolderBase; -import com.intellij.openapi.util.diff.DiffManagerEx; -import com.intellij.openapi.util.diff.actions.impl.*; -import com.intellij.openapi.util.diff.api.DiffTool; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool.DiffViewer; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.ErrorDiffRequest; -import com.intellij.openapi.util.diff.requests.MessageDiffRequest; -import com.intellij.openapi.util.diff.requests.NoDiffRequest; -import com.intellij.openapi.util.diff.tools.ErrorDiffTool; -import com.intellij.openapi.util.diff.tools.external.ExternalDiffTool; -import com.intellij.openapi.util.diff.tools.util.DiffDataKeys; -import com.intellij.openapi.util.diff.tools.util.PrevNextDifferenceIterable; -import org.intellij.lang.annotations.CalledInAwt; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy; -import com.intellij.openapi.util.diff.util.DiffUserDataKeysEx; -import com.intellij.openapi.util.diff.util.DiffUtil; import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; +import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffViewerWrapper.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffViewerWrapper.java similarity index 80% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffViewerWrapper.java rename to platform/diff-impl/src/com/intellij/diff/impl/DiffViewerWrapper.java index ef43b1139c09..bc7667324eae 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffViewerWrapper.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffViewerWrapper.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.impl; +package com.intellij.diff.impl; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool.DiffViewer; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool.DiffViewer; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; public interface DiffViewerWrapper { diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffWindow.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffWindow.java similarity index 88% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffWindow.java rename to platform/diff-impl/src/com/intellij/diff/impl/DiffWindow.java index bc4b2d31b674..d79f0efc500b 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffWindow.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffWindow.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.impl; +package com.intellij.diff.impl; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.chains.DiffRequestChain; +import com.intellij.diff.util.DiffUtil; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; -import com.intellij.openapi.util.diff.util.DiffUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffWindowBase.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffWindowBase.java similarity index 92% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffWindowBase.java rename to platform/diff-impl/src/com/intellij/diff/impl/DiffWindowBase.java index 66cd4f5fcf02..2f5b81d48dd9 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/DiffWindowBase.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffWindowBase.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.impl; +package com.intellij.diff.impl; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.WindowWrapper; import com.intellij.openapi.ui.WindowWrapperBuilder; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUtil; import com.intellij.util.ImageLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/ModifiablePanel.java b/platform/diff-impl/src/com/intellij/diff/impl/ModifiablePanel.java similarity index 96% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/impl/ModifiablePanel.java rename to platform/diff-impl/src/com/intellij/diff/impl/ModifiablePanel.java index ff871730d5e8..3fff31d37435 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/impl/ModifiablePanel.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/ModifiablePanel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.impl; +package com.intellij.diff.impl; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/requests/ErrorDiffRequest.java b/platform/diff-impl/src/com/intellij/diff/requests/ErrorDiffRequest.java similarity index 94% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/requests/ErrorDiffRequest.java rename to platform/diff-impl/src/com/intellij/diff/requests/ErrorDiffRequest.java index 234402970131..0698b505f859 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/requests/ErrorDiffRequest.java +++ b/platform/diff-impl/src/com/intellij/diff/requests/ErrorDiffRequest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.requests; +package com.intellij.diff.requests; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentable; +import com.intellij.diff.chains.DiffRequestPresentable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsConfigurable.java b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsConfigurable.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsConfigurable.java rename to platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsConfigurable.java index 3c49c88bb7fa..6563e8df3d88 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsConfigurable.java +++ b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsConfigurable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.settings; +package com.intellij.diff.settings; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsPaneExternall.form b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPaneExternall.form similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsPaneExternall.form rename to platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPaneExternall.form index 669cef8974f9..61589814bc43 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsPaneExternall.form +++ b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPaneExternall.form @@ -1,5 +1,5 @@ -
+ diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsPanel.form b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.form similarity index 87% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsPanel.form rename to platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.form index f51dc211ea17..423aef8d132d 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsPanel.form +++ b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.form @@ -1,5 +1,5 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsPanel.java b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.java similarity index 92% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsPanel.java rename to platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.java index 06a79d6f158d..1108503cfcb7 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/DiffSettingsPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.settings; +package com.intellij.diff.settings; -import com.intellij.openapi.util.diff.tools.util.base.TextDiffSettingsHolder; -import com.intellij.openapi.util.diff.tools.util.base.TextDiffSettingsHolder.TextDiffSettings; +import com.intellij.diff.tools.util.base.TextDiffSettingsHolder; +import com.intellij.diff.tools.util.base.TextDiffSettingsHolder.TextDiffSettings; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/ExternalDiffSettingsConfigurable.java b/platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsConfigurable.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/settings/ExternalDiffSettingsConfigurable.java rename to platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsConfigurable.java index 6e50c028e769..0ef393f82887 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/ExternalDiffSettingsConfigurable.java +++ b/platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsConfigurable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.settings; +package com.intellij.diff.settings; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/ExternalDiffSettingsPanel.java b/platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsPanel.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/settings/ExternalDiffSettingsPanel.java rename to platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsPanel.java index 55bf472fec37..6c60c5ba9a8a 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/settings/ExternalDiffSettingsPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsPanel.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.settings; +package com.intellij.diff.settings; +import com.intellij.diff.tools.external.ExternalDiffSettings; import com.intellij.openapi.ui.TextFieldWithBrowseButton; -import com.intellij.openapi.util.diff.tools.external.ExternalDiffSettings; import com.intellij.ui.components.JBCheckBox; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/ErrorDiffTool.java b/platform/diff-impl/src/com/intellij/diff/tools/ErrorDiffTool.java similarity index 85% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/ErrorDiffTool.java rename to platform/diff-impl/src/com/intellij/diff/tools/ErrorDiffTool.java index cc4ab4c10eb2..dd0a87dd7dfc 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/ErrorDiffTool.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/ErrorDiffTool.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools; +package com.intellij.diff.tools; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.ErrorDiffRequest; -import com.intellij.openapi.util.diff.requests.MessageDiffRequest; -import com.intellij.openapi.util.diff.util.DiffUtil; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.ErrorDiffRequest; +import com.intellij.diff.requests.MessageDiffRequest; +import com.intellij.diff.util.DiffUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryContentPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryContentPanel.java similarity index 90% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryContentPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryContentPanel.java index 0bc832684155..1fdd5afdfc55 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryContentPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryContentPanel.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.binary; +package com.intellij.diff.tools.binary; +import com.intellij.diff.tools.util.twoside.TwosideContentPanel; import com.intellij.openapi.fileEditor.FileEditor; -import com.intellij.openapi.util.diff.tools.util.twoside.TwosideContentPanel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryDiffPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffPanel.java similarity index 89% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryDiffPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffPanel.java index 89562d382e07..6d22b6bac807 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryDiffPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffPanel.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.binary; +package com.intellij.diff.tools.binary; +import com.intellij.diff.DiffContext; +import com.intellij.diff.tools.util.EditorsDiffPanelBase; +import com.intellij.diff.util.TextDiffType; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.fileEditor.FileEditor; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.tools.util.EditorsDiffPanelBase; -import com.intellij.openapi.util.diff.util.TextDiffType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryDiffTool.java b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffTool.java similarity index 84% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryDiffTool.java rename to platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffTool.java index a74947f420b7..542ce0779bc4 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryDiffTool.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffTool.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.binary; +package com.intellij.diff.tools.binary; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; public class BinaryDiffTool implements FrameDiffTool { diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java similarity index 94% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryDiffViewer.java rename to platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java index bc32fce7f0b6..33ec90a008e9 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/binary/BinaryDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java @@ -13,8 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.binary; +package com.intellij.diff.tools.binary; +import com.intellij.diff.DiffContext; +import com.intellij.diff.actions.impl.FocusOppositePaneAction; +import com.intellij.diff.contents.BinaryFileContent; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.contents.EmptyContent; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.tools.util.StatusPanel; +import com.intellij.diff.tools.util.base.ListenerDiffViewerBase; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUtil; +import com.intellij.diff.util.Side; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.diagnostic.Logger; @@ -35,19 +48,6 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.util.Couple; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.actions.impl.FocusOppositePaneAction; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.contents.BinaryFileContent; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.contents.EmptyContent; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.tools.util.StatusPanel; -import com.intellij.openapi.util.diff.tools.util.base.ListenerDiffViewerBase; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUtil; -import com.intellij.openapi.util.diff.util.Side; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/dir/DifDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/dir/DifDiffViewer.java similarity index 89% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/dir/DifDiffViewer.java rename to platform/diff-impl/src/com/intellij/diff/tools/dir/DifDiffViewer.java index 710e6c1cb04e..bde3dc0aad36 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/dir/DifDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/dir/DifDiffViewer.java @@ -13,8 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.dir; +package com.intellij.diff.tools.dir; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DirectoryContent; +import com.intellij.diff.contents.FileContent; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; import com.intellij.ide.diff.DiffElement; import com.intellij.ide.diff.DirDiffSettings; import com.intellij.ide.diff.JarFileDiffElement; @@ -26,13 +33,6 @@ import com.intellij.openapi.diff.impl.dir.DirDiffPanel; import com.intellij.openapi.diff.impl.dir.DirDiffTableModel; import com.intellij.openapi.diff.impl.dir.DirDiffWindow; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DirectoryContent; -import com.intellij.openapi.util.diff.contents.FileContent; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/dir/DirDiffTool.java b/platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffTool.java similarity index 80% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/dir/DirDiffTool.java rename to platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffTool.java index 835159354e3f..4bdf3d29256f 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/dir/DirDiffTool.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffTool.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.dir; +package com.intellij.diff.tools.dir; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; public class DirDiffTool implements FrameDiffTool { diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/external/ExternalDiffSettings.java b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffSettings.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/external/ExternalDiffSettings.java rename to platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffSettings.java index c41e4279949e..0abec0fcb956 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/external/ExternalDiffSettings.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffSettings.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.external; +package com.intellij.diff.tools.external; +import com.intellij.diff.util.DiffUtil; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.diff.impl.external.DiffManagerImpl; -import com.intellij.openapi.util.diff.util.DiffUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.config.AbstractProperty; import com.intellij.util.config.BooleanProperty; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/external/ExternalDiffTool.java b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffTool.java similarity index 89% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/external/ExternalDiffTool.java rename to platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffTool.java index 1e2f85edba21..f35e25839dcb 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/external/ExternalDiffTool.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffTool.java @@ -13,8 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.external; +package com.intellij.diff.tools.external; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManagerEx; +import com.intellij.diff.chains.DiffRequestChain; +import com.intellij.diff.chains.DiffRequestPresentable; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.chains.SimpleDiffRequestChain; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; import com.intellij.execution.ExecutionException; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; @@ -27,15 +36,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.UserDataHolderBase; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManagerEx; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentable; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.chains.SimpleDiffRequestChain; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/external/ExternalDiffToolUtil.java b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/external/ExternalDiffToolUtil.java rename to platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java index f057b8624998..192a65d18904 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/external/ExternalDiffToolUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.external; +package com.intellij.diff.tools.external; +import com.intellij.diff.contents.*; import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.CommandLineTokenizer; import com.intellij.execution.configurations.GeneralCommandLine; @@ -22,7 +23,6 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.util.Computable; -import com.intellij.openapi.util.diff.contents.*; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/ChangedBlock.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/ChangedBlock.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/ChangedBlock.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/ChangedBlock.java index 3f0033a5520a..efadc7f79cd7 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/ChangedBlock.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/ChangedBlock.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; -import com.intellij.openapi.util.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.DiffFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/HighlightRange.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/HighlightRange.java similarity index 91% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/HighlightRange.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/HighlightRange.java index 4d593383fcba..1f6b04e06f92 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/HighlightRange.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/HighlightRange.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; +import com.intellij.diff.util.Side; import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.util.diff.util.Side; import org.jetbrains.annotations.NotNull; class HighlightRange { diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/LineNumberConvertor.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineNumberConvertor.java similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/LineNumberConvertor.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineNumberConvertor.java index 5248b6bcc95e..55a2540be0c6 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/LineNumberConvertor.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineNumberConvertor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; import gnu.trove.TIntFunction; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideContentPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideContentPanel.java similarity index 96% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideContentPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideContentPanel.java index 2fe383f4cd1a..d8041af1890e 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideContentPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideContentPanel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; import com.intellij.openapi.editor.Editor; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffChange.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffChange.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffChange.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffChange.java index 21bb82f43042..ac7c6a394945 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffChange.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffChange.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.util.DiffDrawUtil; +import com.intellij.diff.util.TextDiffType; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.editor.markup.SeparatorPlacement; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.util.DiffDrawUtil; -import com.intellij.openapi.util.diff.util.TextDiffType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffPanel.java similarity index 91% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffPanel.java index d59df44552b8..f41b1e1593ce 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffPanel.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; +import com.intellij.diff.DiffContext; +import com.intellij.diff.comparison.DiffTooBigException; +import com.intellij.diff.tools.util.base.DiffPanelBase; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.comparison.DiffTooBigException; -import com.intellij.openapi.util.diff.tools.util.base.DiffPanelBase; import com.intellij.util.ui.AsyncProcessIcon; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; -import static com.intellij.openapi.util.diff.util.DiffUtil.createMessagePanel; +import static com.intellij.diff.util.DiffUtil.createMessagePanel; class OnesideDiffPanel extends DiffPanelBase { private static final String GOOD_CONTENT = "GoodContent"; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffTool.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffTool.java similarity index 84% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffTool.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffTool.java index 3accb0ee6af9..b94dbefc2b54 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffTool.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffTool.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; public class OnesideDiffTool implements FrameDiffTool { diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffViewer.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java index 548a1f44969b..391f625c8907 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java @@ -13,11 +13,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; import com.intellij.codeInsight.hint.HintManager; import com.intellij.codeInsight.hint.HintManagerImpl; import com.intellij.codeInsight.hint.HintUtil; +import com.intellij.diff.DiffContext; +import com.intellij.diff.actions.BufferedLineIterator; +import com.intellij.diff.actions.NavigationContextChecker; +import com.intellij.diff.actions.impl.OpenInEditorWithMouseAction; +import com.intellij.diff.comparison.DiffTooBigException; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.IntPair; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.tools.util.DiffDataKeys; +import com.intellij.diff.tools.util.FoldingModelSupport.OnesideFoldingModel; +import com.intellij.diff.tools.util.PrevNextDifferenceIterable; +import com.intellij.diff.tools.util.StatusPanel; +import com.intellij.diff.tools.util.base.HighlightPolicy; +import com.intellij.diff.tools.util.base.IgnorePolicy; +import com.intellij.diff.tools.util.base.TextDiffViewerBase; +import com.intellij.diff.tools.util.twoside.TwosideTextDiffViewer; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy; +import com.intellij.diff.util.DiffUserDataKeysEx; +import com.intellij.diff.util.DiffUtil; +import com.intellij.diff.util.DiffUtil.DocumentData; +import com.intellij.diff.util.Side; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.Separator; import com.intellij.openapi.application.ApplicationManager; @@ -35,31 +60,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.actions.BufferedLineIterator; -import com.intellij.openapi.util.diff.actions.NavigationContextChecker; -import com.intellij.openapi.util.diff.actions.impl.OpenInEditorWithMouseAction; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.comparison.DiffTooBigException; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.IntPair; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.tools.util.DiffDataKeys; -import com.intellij.openapi.util.diff.tools.util.FoldingModelSupport.OnesideFoldingModel; -import com.intellij.openapi.util.diff.tools.util.PrevNextDifferenceIterable; -import com.intellij.openapi.util.diff.tools.util.StatusPanel; -import com.intellij.openapi.util.diff.tools.util.base.HighlightPolicy; -import com.intellij.openapi.util.diff.tools.util.base.IgnorePolicy; -import com.intellij.openapi.util.diff.tools.util.base.TextDiffViewerBase; -import com.intellij.openapi.util.diff.tools.util.twoside.TwosideTextDiffViewer; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy; -import com.intellij.openapi.util.diff.util.DiffUserDataKeysEx; -import com.intellij.openapi.util.diff.util.DiffUtil; -import com.intellij.openapi.util.diff.util.DiffUtil.DocumentData; -import com.intellij.openapi.util.diff.util.Side; import com.intellij.ui.LightweightHint; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.MergingCharSequence; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideEditorHighlighter.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorHighlighter.java similarity index 99% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideEditorHighlighter.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorHighlighter.java index 5269197a959d..1b3475287508 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideEditorHighlighter.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorHighlighter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideEditorRangeHighlighter.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorRangeHighlighter.java similarity index 99% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideEditorRangeHighlighter.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorRangeHighlighter.java index 0c7094dd2c55..486618176917 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideEditorRangeHighlighter.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideEditorRangeHighlighter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideFragmentBuilder.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideFragmentBuilder.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideFragmentBuilder.java rename to platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideFragmentBuilder.java index 699f8865a235..e8311495afec 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/fragmented/OnesideFragmentBuilder.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideFragmentBuilder.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.IntPair; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.util.Side; import com.intellij.openapi.editor.Document; import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.IntPair; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.util.Side; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/DiffOperation.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/DiffOperation.java similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/DiffOperation.java rename to platform/diff-impl/src/com/intellij/diff/tools/simple/DiffOperation.java index 4d3cf1d82033..a60bb89b8b65 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/DiffOperation.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/DiffOperation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.simple; +package com.intellij.diff.tools.simple; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleDiffChange.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleDiffChange.java rename to platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java index 03244d15fe28..ae32dd8ae4ea 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleDiffChange.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java @@ -13,8 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.simple; +package com.intellij.diff.tools.simple; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.util.DiffDrawUtil; +import com.intellij.diff.util.DiffUtil; +import com.intellij.diff.util.Side; +import com.intellij.diff.util.TextDiffType; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.editor.Document; @@ -23,12 +29,6 @@ import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.editor.markup.SeparatorPlacement; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.util.DiffDrawUtil; -import com.intellij.openapi.util.diff.util.DiffUtil; -import com.intellij.openapi.util.diff.util.Side; -import com.intellij.openapi.util.diff.util.TextDiffType; import org.intellij.lang.annotations.CalledWithWriteLock; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleDiffTool.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffTool.java similarity index 86% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleDiffTool.java rename to platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffTool.java index 2a7a40f81b32..8e450792cb30 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleDiffTool.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffTool.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.simple; +package com.intellij.diff.tools.simple; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; public class SimpleDiffTool implements FrameDiffTool { diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleDiffViewer.java rename to platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java index 9e35bd01c0b0..b64960e87ab3 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java @@ -13,11 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.simple; +package com.intellij.diff.tools.simple; import com.intellij.codeInsight.hint.HintManager; import com.intellij.codeInsight.hint.HintManagerImpl; import com.intellij.codeInsight.hint.HintUtil; +import com.intellij.diff.DiffContext; +import com.intellij.diff.actions.BufferedLineIterator; +import com.intellij.diff.actions.NavigationContextChecker; +import com.intellij.diff.comparison.DiffTooBigException; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.fragments.LineFragmentImpl; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.tools.util.*; +import com.intellij.diff.tools.util.FoldingModelSupport.SimpleFoldingModel; +import com.intellij.diff.tools.util.base.HighlightPolicy; +import com.intellij.diff.tools.util.twoside.TwosideTextDiffViewer; +import com.intellij.diff.util.DiffDividerDrawUtil; +import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy; +import com.intellij.diff.util.DiffUtil; +import com.intellij.diff.util.DiffUtil.DocumentData; +import com.intellij.diff.util.Side; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -36,24 +54,6 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.actions.BufferedLineIterator; -import com.intellij.openapi.util.diff.actions.NavigationContextChecker; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.comparison.DiffTooBigException; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.fragments.LineFragmentImpl; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.tools.util.*; -import com.intellij.openapi.util.diff.tools.util.FoldingModelSupport.SimpleFoldingModel; -import com.intellij.openapi.util.diff.tools.util.base.HighlightPolicy; -import com.intellij.openapi.util.diff.tools.util.twoside.TwosideTextDiffViewer; -import com.intellij.openapi.util.diff.util.DiffDividerDrawUtil; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy; -import com.intellij.openapi.util.diff.util.DiffUtil; -import com.intellij.openapi.util.diff.util.DiffUtil.DocumentData; -import com.intellij.openapi.util.diff.util.Side; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.LightweightHint; import org.intellij.lang.annotations.CalledInAwt; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleThreesideDiffChange.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffChange.java similarity index 96% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleThreesideDiffChange.java rename to platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffChange.java index 2b61d983ad97..a8753e47f6dd 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleThreesideDiffChange.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffChange.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.simple; +package com.intellij.diff.tools.simple; +import com.intellij.diff.comparison.ComparisonPolicy; +import com.intellij.diff.comparison.ComparisonUtil; +import com.intellij.diff.fragments.MergeLineFragment; +import com.intellij.diff.util.*; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.DocumentEx; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.editor.markup.SeparatorPlacement; -import com.intellij.openapi.util.diff.comparison.ComparisonPolicy; -import com.intellij.openapi.util.diff.comparison.ComparisonUtil; -import com.intellij.openapi.util.diff.fragments.MergeLineFragment; -import com.intellij.openapi.util.diff.util.*; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleThreesideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java similarity index 94% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleThreesideDiffViewer.java rename to platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java index a3817e38e32b..dead10854245 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/simple/SimpleThreesideDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java @@ -13,11 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.simple; +package com.intellij.diff.tools.simple; import com.intellij.codeInsight.hint.HintManager; import com.intellij.codeInsight.hint.HintManagerImpl; import com.intellij.codeInsight.hint.HintUtil; +import com.intellij.diff.DiffContext; +import com.intellij.diff.comparison.ByLine; +import com.intellij.diff.comparison.ComparisonPolicy; +import com.intellij.diff.comparison.DiffTooBigException; +import com.intellij.diff.comparison.MergeUtil; +import com.intellij.diff.comparison.iterables.FairDiffIterable; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.fragments.MergeLineFragment; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.tools.util.*; +import com.intellij.diff.tools.util.FoldingModelSupport.SimpleThreesideFoldingModel; +import com.intellij.diff.tools.util.base.IgnorePolicy; +import com.intellij.diff.tools.util.threeside.ThreesideTextDiffViewer; +import com.intellij.diff.util.DiffDividerDrawUtil; +import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy; +import com.intellij.diff.util.DiffUtil; +import com.intellij.diff.util.Side; +import com.intellij.diff.util.ThreeSide; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.Separator; import com.intellij.openapi.application.ApplicationManager; @@ -29,23 +49,6 @@ import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.Computable; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.comparison.ByLine; -import com.intellij.openapi.util.diff.comparison.ComparisonPolicy; -import com.intellij.openapi.util.diff.comparison.DiffTooBigException; -import com.intellij.openapi.util.diff.comparison.MergeUtil; -import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.fragments.MergeLineFragment; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.tools.util.*; -import com.intellij.openapi.util.diff.tools.util.FoldingModelSupport.SimpleThreesideFoldingModel; -import com.intellij.openapi.util.diff.tools.util.base.IgnorePolicy; -import com.intellij.openapi.util.diff.tools.util.threeside.ThreesideTextDiffViewer; -import com.intellij.openapi.util.diff.util.*; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.LightweightHint; import com.intellij.util.containers.ContainerUtil; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/BaseSyncScrollable.java b/platform/diff-impl/src/com/intellij/diff/tools/util/BaseSyncScrollable.java similarity index 96% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/BaseSyncScrollable.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/BaseSyncScrollable.java index a9c7e9af3ed0..08103511e6d7 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/BaseSyncScrollable.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/BaseSyncScrollable.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; -import com.intellij.openapi.util.diff.util.Side; +import com.intellij.diff.util.Side; import org.jetbrains.annotations.NotNull; public abstract class BaseSyncScrollable implements SyncScrollSupport.SyncScrollable { diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/DiffDataKeys.java b/platform/diff-impl/src/com/intellij/diff/tools/util/DiffDataKeys.java similarity index 84% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/DiffDataKeys.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/DiffDataKeys.java index 93dc8cce3546..f4b4391b8d50 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/DiffDataKeys.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/DiffDataKeys.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.fileEditor.OpenFileDescriptor; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.requests.DiffRequest; public interface DiffDataKeys { DataKey DIFF_REQUEST = DataKey.create("diff_request"); diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/DiffSplitter.java b/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java similarity index 96% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/DiffSplitter.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java index dcdeae914ccc..01d7f73e0601 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/DiffSplitter.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/DiffSplitter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; import com.intellij.openapi.ui.Divider; import com.intellij.openapi.ui.Splitter; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/EditorsDiffPanelBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/EditorsDiffPanelBase.java similarity index 90% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/EditorsDiffPanelBase.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/EditorsDiffPanelBase.java index ba162276d481..d4cb95b84fee 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/EditorsDiffPanelBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/EditorsDiffPanelBase.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; +import com.intellij.diff.DiffContext; +import com.intellij.diff.tools.util.base.DiffPanelBase; +import com.intellij.diff.util.DiffUtil; import com.intellij.openapi.actionSystem.DataProvider; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.tools.util.base.DiffPanelBase; -import com.intellij.openapi.util.diff.util.DiffUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/FoldingModelSupport.java b/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/FoldingModelSupport.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java index 93eeec222369..a4468c00bf6c 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/FoldingModelSupport.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java @@ -13,8 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; +import com.intellij.diff.comparison.iterables.DiffIterableUtil.IntPair; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.fragments.MergeLineFragment; +import com.intellij.diff.util.DiffDividerDrawUtil; +import com.intellij.diff.util.DiffDrawUtil; +import com.intellij.diff.util.Side; +import com.intellij.diff.util.ThreeSide; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; @@ -29,13 +36,6 @@ import com.intellij.openapi.util.BooleanGetter; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.IntPair; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.fragments.MergeLineFragment; -import com.intellij.openapi.util.diff.util.DiffDividerDrawUtil; -import com.intellij.openapi.util.diff.util.DiffDrawUtil; -import com.intellij.openapi.util.diff.util.Side; -import com.intellij.openapi.util.diff.util.ThreeSide; import com.intellij.openapi.util.text.StringUtil; import gnu.trove.TIntFunction; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/LineFragmentCache.java b/platform/diff-impl/src/com/intellij/diff/tools/util/LineFragmentCache.java similarity index 93% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/LineFragmentCache.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/LineFragmentCache.java index dbfb189a44a7..9653f0fc77bf 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/LineFragmentCache.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/LineFragmentCache.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; -import com.intellij.openapi.util.diff.comparison.ComparisonPolicy; -import com.intellij.openapi.util.diff.fragments.LineFragment; +import com.intellij.diff.comparison.ComparisonPolicy; +import com.intellij.diff.fragments.LineFragment; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/PrevNextDifferenceIterable.java b/platform/diff-impl/src/com/intellij/diff/tools/util/PrevNextDifferenceIterable.java similarity index 94% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/PrevNextDifferenceIterable.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/PrevNextDifferenceIterable.java index 9f6b3600b37a..aea7a7f848ae 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/PrevNextDifferenceIterable.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/PrevNextDifferenceIterable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/SoftHardCacheMap.java b/platform/diff-impl/src/com/intellij/diff/tools/util/SoftHardCacheMap.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/SoftHardCacheMap.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/SoftHardCacheMap.java index 8b1c283418a1..8ded7c1e0566 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/SoftHardCacheMap.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/SoftHardCacheMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; import com.intellij.util.containers.SLRUMap; import com.intellij.util.containers.SoftValueHashMap; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/StatusPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/StatusPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java index 0f947ee0d4be..82711464a7ab 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/StatusPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/StatusPanel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; import com.intellij.openapi.diff.DiffBundle; import com.intellij.util.ui.AnimatedIcon; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/SyncScrollSupport.java b/platform/diff-impl/src/com/intellij/diff/tools/util/SyncScrollSupport.java similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/SyncScrollSupport.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/SyncScrollSupport.java index 2b7321094d24..3ee80429a134 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/SyncScrollSupport.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/SyncScrollSupport.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; +import com.intellij.diff.util.Side; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.LogicalPosition; import com.intellij.openapi.editor.ScrollingModel; import com.intellij.openapi.editor.event.VisibleAreaEvent; import com.intellij.openapi.editor.event.VisibleAreaListener; -import org.intellij.lang.annotations.CalledInAwt; -import com.intellij.openapi.util.diff.util.Side; import gnu.trove.TIntFunction; +import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/ThreeDiffSplitter.java b/platform/diff-impl/src/com/intellij/diff/tools/util/ThreeDiffSplitter.java similarity index 94% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/ThreeDiffSplitter.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/ThreeDiffSplitter.java index 99794727cc59..a28e3f168203 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/ThreeDiffSplitter.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/ThreeDiffSplitter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util; +package com.intellij.diff.tools.util; -import com.intellij.openapi.util.diff.tools.util.DiffSplitter.Painter; -import org.intellij.lang.annotations.CalledInAwt; -import com.intellij.openapi.util.diff.util.Side; +import com.intellij.diff.tools.util.DiffSplitter.Painter; +import com.intellij.diff.util.Side; import com.intellij.util.containers.ContainerUtil; +import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/DiffPanelBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java similarity index 96% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/DiffPanelBase.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java index 2df7fb629588..2f61106c66fb 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/DiffPanelBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.base; +package com.intellij.diff.tools.util.base; +import com.intellij.diff.DiffContext; +import com.intellij.diff.comparison.DiffTooBigException; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.comparison.DiffTooBigException; import com.intellij.ui.EditorNotificationPanel; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/DiffViewerBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java similarity index 92% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/DiffViewerBase.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java index 4f3447d772da..58a50700d40d 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/DiffViewerBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java @@ -13,8 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.base; +package com.intellij.diff.tools.util.base; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.FrameDiffTool.DiffViewer; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.tools.util.DiffDataKeys; +import com.intellij.diff.util.WaitingBackgroundableTaskExecutor; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataProvider; @@ -25,17 +31,11 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.util.ProgressWindow; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool.DiffViewer; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.tools.util.DiffDataKeys; -import org.intellij.lang.annotations.CalledInAwt; -import org.intellij.lang.annotations.CalledInBackground; -import com.intellij.openapi.util.diff.util.WaitingBackgroundableTaskExecutor; import com.intellij.util.Alarm; import com.intellij.util.containers.Convertor; import com.intellij.util.ui.UIUtil; +import org.intellij.lang.annotations.CalledInAwt; +import org.intellij.lang.annotations.CalledInBackground; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/HighlightPolicy.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/HighlightPolicy.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/HighlightPolicy.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/base/HighlightPolicy.java index 71b46cd60d1a..69938f66fdad 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/HighlightPolicy.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/HighlightPolicy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.base; +package com.intellij.diff.tools.util.base; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/IgnorePolicy.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/IgnorePolicy.java similarity index 92% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/IgnorePolicy.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/base/IgnorePolicy.java index d0bd24b1cbe6..a2317b3489ed 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/IgnorePolicy.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/IgnorePolicy.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.base; +package com.intellij.diff.tools.util.base; -import com.intellij.openapi.util.diff.comparison.ComparisonPolicy; +import com.intellij.diff.comparison.ComparisonPolicy; import org.jetbrains.annotations.NotNull; public enum IgnorePolicy { diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/ListenerDiffViewerBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java similarity index 91% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/ListenerDiffViewerBase.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java index 642c60784d7f..f66264eac2a5 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/ListenerDiffViewerBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.base; +package com.intellij.diff.tools.util.base; +import com.intellij.diff.DiffContext; +import com.intellij.diff.contents.BinaryFileContent; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.requests.ContentDiffRequest; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.event.DocumentListener; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.contents.BinaryFileContent; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import org.intellij.lang.annotations.CalledInAwt; import com.intellij.openapi.vfs.*; import com.intellij.util.containers.HashSet; +import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/TextDiffSettingsHolder.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/TextDiffSettingsHolder.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.java index 748a5518a817..a583068b2668 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/TextDiffSettingsHolder.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.base; +package com.intellij.diff.tools.util.base; +import com.intellij.diff.util.DiffPlaces; +import com.intellij.diff.util.DiffUtil; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.diff.util.DiffPlaces; -import com.intellij.openapi.util.diff.util.DiffUtil; import com.intellij.util.containers.HashMap; import com.intellij.util.xmlb.annotations.MapAnnotation; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/TextDiffViewerBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerBase.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/TextDiffViewerBase.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerBase.java index 2396c73d3871..a5b335471d5c 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/base/TextDiffViewerBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerBase.java @@ -13,8 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.base; +package com.intellij.diff.tools.util.base; +import com.intellij.diff.DiffContext; +import com.intellij.diff.actions.impl.SetEditorSettingsAction; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.tools.util.base.TextDiffSettingsHolder.TextDiffSettings; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUtil; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ComboBoxAction; @@ -24,15 +30,9 @@ import com.intellij.openapi.editor.event.EditorMouseEvent; import com.intellij.openapi.editor.event.EditorMouseEventArea; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.diff.actions.impl.SetEditorSettingsAction; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.tools.util.base.TextDiffSettingsHolder.TextDiffSettings; -import org.intellij.lang.annotations.CalledInAwt; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUtil; import com.intellij.ui.ToggleActionButton; import com.intellij.util.EditorPopupHandler; +import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideContentPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideContentPanel.java similarity index 89% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideContentPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideContentPanel.java index 4a49f9bab2bd..54dd3aad302d 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideContentPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideContentPanel.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.threeside; +package com.intellij.diff.tools.util.threeside; -import com.intellij.openapi.util.diff.tools.util.DiffSplitter; -import com.intellij.openapi.util.diff.tools.util.ThreeDiffSplitter; +import com.intellij.diff.tools.util.DiffSplitter; +import com.intellij.diff.tools.util.ThreeDiffSplitter; +import com.intellij.diff.util.Side; import org.intellij.lang.annotations.CalledInAwt; -import com.intellij.openapi.util.diff.util.Side; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideTextContentPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextContentPanel.java similarity index 94% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideTextContentPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextContentPanel.java index 945b45738e30..73e25f7fa744 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideTextContentPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextContentPanel.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.threeside; +package com.intellij.diff.tools.util.threeside; +import com.intellij.diff.util.Side; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.EditorEx; -import com.intellij.openapi.util.diff.util.Side; import com.intellij.util.ui.ButtonlessScrollBarUI; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideTextDiffPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffPanel.java similarity index 87% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideTextDiffPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffPanel.java index 4a7700962509..32d44d3a3a11 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideTextDiffPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffPanel.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.threeside; +package com.intellij.diff.tools.util.threeside; +import com.intellij.diff.DiffContext; +import com.intellij.diff.tools.util.EditorsDiffPanelBase; import com.intellij.openapi.actionSystem.DataProvider; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.tools.util.EditorsDiffPanelBase; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideTextDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideTextDiffViewer.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java index 1987b8ea48e2..5f86a44165d1 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/threeside/ThreesideTextDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java @@ -13,8 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.threeside; +package com.intellij.diff.tools.util.threeside; +import com.intellij.diff.DiffContext; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManager; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; +import com.intellij.diff.tools.util.SyncScrollSupport; +import com.intellij.diff.tools.util.SyncScrollSupport.ThreesideSyncScrollSupport; +import com.intellij.diff.tools.util.base.TextDiffViewerBase; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy; +import com.intellij.diff.util.DiffUtil; +import com.intellij.diff.util.Side; +import com.intellij.diff.util.ThreeSide; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.diagnostic.Logger; @@ -32,19 +48,6 @@ import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; -import com.intellij.openapi.util.diff.tools.util.SyncScrollSupport; -import com.intellij.openapi.util.diff.tools.util.SyncScrollSupport.ThreesideSyncScrollSupport; -import com.intellij.openapi.util.diff.tools.util.base.TextDiffViewerBase; -import com.intellij.openapi.util.diff.util.*; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy; import com.intellij.openapi.util.registry.Registry; import com.intellij.util.containers.ContainerUtil; import org.intellij.lang.annotations.CalledInAwt; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideContentPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideContentPanel.java similarity index 94% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideContentPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideContentPanel.java index fb030e3c571d..2c5bfbcd333f 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideContentPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideContentPanel.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.twoside; +package com.intellij.diff.tools.util.twoside; -import com.intellij.openapi.util.diff.tools.util.DiffSplitter; +import com.intellij.diff.tools.util.DiffSplitter; import org.intellij.lang.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideTextContentPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextContentPanel.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideTextContentPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextContentPanel.java index 4a4a92c80fb0..13f029e80a87 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideTextContentPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextContentPanel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.twoside; +package com.intellij.diff.tools.util.twoside; import com.intellij.openapi.editor.Editor; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideTextDiffPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffPanel.java similarity index 87% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideTextDiffPanel.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffPanel.java index 91b1456669a7..2b08d6d7767c 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideTextDiffPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffPanel.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.twoside; +package com.intellij.diff.tools.util.twoside; +import com.intellij.diff.DiffContext; +import com.intellij.diff.tools.util.EditorsDiffPanelBase; import com.intellij.openapi.actionSystem.DataProvider; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.tools.util.EditorsDiffPanelBase; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideTextDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java similarity index 95% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideTextDiffViewer.java rename to platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java index 12febbac60e8..e76119214df6 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/tools/util/twoside/TwosideTextDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java @@ -13,8 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.util.twoside; +package com.intellij.diff.tools.util.twoside; +import com.intellij.diff.DiffContext; +import com.intellij.diff.actions.impl.FocusOppositePaneAction; +import com.intellij.diff.actions.impl.OpenInEditorWithMouseAction; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.contents.EmptyContent; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.tools.util.SyncScrollSupport; +import com.intellij.diff.tools.util.SyncScrollSupport.TwosideSyncScrollSupport; +import com.intellij.diff.tools.util.base.TextDiffViewerBase; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy; +import com.intellij.diff.util.DiffUserDataKeysEx; +import com.intellij.diff.util.DiffUtil; +import com.intellij.diff.util.Side; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diff.DiffNavigationContext; @@ -29,19 +45,6 @@ import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.actions.impl.FocusOppositePaneAction; -import com.intellij.openapi.util.diff.actions.impl.OpenInEditorWithMouseAction; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.contents.EmptyContent; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.tools.util.SyncScrollSupport; -import com.intellij.openapi.util.diff.tools.util.SyncScrollSupport.TwosideSyncScrollSupport; -import com.intellij.openapi.util.diff.tools.util.base.TextDiffViewerBase; -import com.intellij.openapi.util.diff.util.*; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy; import com.intellij.openapi.util.registry.Registry; import com.intellij.util.containers.ContainerUtil; import org.intellij.lang.annotations.CalledInAwt; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffDividerDrawUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java similarity index 99% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffDividerDrawUtil.java rename to platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java index 5835035748f6..b6db2850a885 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffDividerDrawUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.openapi.diff.impl.splitter.Transformation; import com.intellij.openapi.editor.Editor; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffDrawUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java similarity index 99% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffDrawUtil.java rename to platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java index 1746ac173113..29f6c02354cf 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffDrawUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.markup.*; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffEmptyHighlighterRenderer.java b/platform/diff-impl/src/com/intellij/diff/util/DiffEmptyHighlighterRenderer.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffEmptyHighlighterRenderer.java rename to platform/diff-impl/src/com/intellij/diff/util/DiffEmptyHighlighterRenderer.java index 552fc356ee63..0005baa4be31 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffEmptyHighlighterRenderer.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffEmptyHighlighterRenderer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.markup.CustomHighlighterRenderer; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffLineMarkerRenderer.java b/platform/diff-impl/src/com/intellij/diff/util/DiffLineMarkerRenderer.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffLineMarkerRenderer.java rename to platform/diff-impl/src/com/intellij/diff/util/DiffLineMarkerRenderer.java index 0ef3f2890bc5..b14f925d7bea 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffLineMarkerRenderer.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffLineMarkerRenderer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.EditorEx; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffLineSeparatorRenderer.java b/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java similarity index 99% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffLineSeparatorRenderer.java rename to platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java index 85e1310eda4e..e6cdd2d62670 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffLineSeparatorRenderer.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffLineSeparatorRenderer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.colors.EditorColors; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffUserDataKeysEx.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java similarity index 90% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffUserDataKeysEx.java rename to platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java index 1c238fb47d45..4a1291729340 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffUserDataKeysEx.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUserDataKeysEx.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; +import com.intellij.diff.tools.util.LineFragmentCache; import com.intellij.openapi.diff.DiffNavigationContext; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.diff.tools.util.LineFragmentCache; import javax.swing.*; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java similarity index 96% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffUtil.java rename to platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java index 81f8ebff1aee..78fa9c912e89 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/DiffUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java @@ -13,9 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.codeStyle.CodeStyleFacade; +import com.intellij.diff.DiffContext; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffTool; +import com.intellij.diff.SuppressiveDiffTool; +import com.intellij.diff.comparison.ComparisonPolicy; +import com.intellij.diff.comparison.ComparisonUtil; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.contents.EmptyContent; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.requests.ContentDiffRequest; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.tools.util.LineFragmentCache; +import com.intellij.diff.tools.util.LineFragmentCache.PolicyData; +import com.intellij.diff.tools.util.base.HighlightPolicy; +import com.intellij.diff.tools.util.base.IgnorePolicy; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.application.ApplicationManager; @@ -39,23 +56,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapperDialog; import com.intellij.openapi.ui.WindowWrapper; import com.intellij.openapi.util.*; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.DiffTool; -import com.intellij.openapi.util.diff.api.SuppressiveDiffTool; -import com.intellij.openapi.util.diff.comparison.ComparisonPolicy; -import com.intellij.openapi.util.diff.comparison.ComparisonUtil; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.contents.EmptyContent; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.tools.util.LineFragmentCache; -import com.intellij.openapi.util.diff.tools.util.LineFragmentCache.PolicyData; -import com.intellij.openapi.util.diff.tools.util.base.HighlightPolicy; -import com.intellij.openapi.util.diff.tools.util.base.IgnorePolicy; import com.intellij.openapi.vfs.ReadonlyStatusHandler; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.IdeFocusManager; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/TextDiffType.java b/platform/diff-impl/src/com/intellij/diff/util/TextDiffType.java similarity index 97% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/TextDiffType.java rename to platform/diff-impl/src/com/intellij/diff/util/TextDiffType.java index 30d8ca8cea5b..5029ccbc79d5 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/TextDiffType.java +++ b/platform/diff-impl/src/com/intellij/diff/util/TextDiffType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.diff.DiffColors; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/TextDiffTypeFactory.java b/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java similarity index 98% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/TextDiffTypeFactory.java rename to platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java index 47c03bf8655e..fae32ac015fc 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/TextDiffTypeFactory.java +++ b/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.colors.EditorColorsManager; diff --git a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/WaitingBackgroundableTaskExecutor.java b/platform/diff-impl/src/com/intellij/diff/util/WaitingBackgroundableTaskExecutor.java similarity index 99% rename from platform/diff-impl/src/com/intellij/openapi/util/diff/util/WaitingBackgroundableTaskExecutor.java rename to platform/diff-impl/src/com/intellij/diff/util/WaitingBackgroundableTaskExecutor.java index 91eeb7c75f3b..03697ef68032 100644 --- a/platform/diff-impl/src/com/intellij/openapi/util/diff/util/WaitingBackgroundableTaskExecutor.java +++ b/platform/diff-impl/src/com/intellij/diff/util/WaitingBackgroundableTaskExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.util; +package com.intellij.diff.util; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; diff --git a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/AutoTestCase.java b/platform/diff-impl/tests/com/intellij/diff/comparison/AutoTestCase.java similarity index 97% rename from platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/AutoTestCase.java rename to platform/diff-impl/tests/com/intellij/diff/comparison/AutoTestCase.java index 7f07a9fdb8cc..2f3b25f7c386 100644 --- a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/AutoTestCase.java +++ b/platform/diff-impl/tests/com/intellij/diff/comparison/AutoTestCase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; diff --git a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/CharComparisonUtilTest.java b/platform/diff-impl/tests/com/intellij/diff/comparison/CharComparisonUtilTest.java similarity index 99% rename from platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/CharComparisonUtilTest.java rename to platform/diff-impl/tests/com/intellij/diff/comparison/CharComparisonUtilTest.java index 8cbc6d368e7a..24f6ae30d94e 100644 --- a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/CharComparisonUtilTest.java +++ b/platform/diff-impl/tests/com/intellij/diff/comparison/CharComparisonUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; public class CharComparisonUtilTest extends ComparisonUtilTestBase { public void testEqualStrings() { diff --git a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/ComparisonUtilAutoTest.java b/platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilAutoTest.java similarity index 98% rename from platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/ComparisonUtilAutoTest.java rename to platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilAutoTest.java index 99f5a45f40ce..154b49c7202e 100644 --- a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/ComparisonUtilAutoTest.java +++ b/platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilAutoTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.LineFragment; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.impl.DocumentImpl; import com.intellij.openapi.progress.DumbProgressIndicator; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.fragments.LineFragment; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.HashMap; diff --git a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/ComparisonUtilTestBase.java b/platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTestBase.java similarity index 99% rename from platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/ComparisonUtilTestBase.java rename to platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTestBase.java index fdaaf47391ae..648fb2d617ea 100644 --- a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/ComparisonUtilTestBase.java +++ b/platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTestBase.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.LineFragment; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.impl.DocumentImpl; import com.intellij.openapi.progress.DumbProgressIndicator; import com.intellij.openapi.util.Couple; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.fragments.LineFragment; import com.intellij.openapi.util.registry.Registry; import com.intellij.testFramework.UsefulTestCase; import com.intellij.util.Function; diff --git a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/LineComparisonUtilTest.java b/platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.java similarity index 98% rename from platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/LineComparisonUtilTest.java rename to platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.java index dd2f2a8834c2..0a0882482b17 100644 --- a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/LineComparisonUtilTest.java +++ b/platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; public class LineComparisonUtilTest extends ComparisonUtilTestBase { public void testEqualStrings() { diff --git a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/SplitComparisonUtilTest.java b/platform/diff-impl/tests/com/intellij/diff/comparison/SplitComparisonUtilTest.java similarity index 95% rename from platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/SplitComparisonUtilTest.java rename to platform/diff-impl/tests/com/intellij/diff/comparison/SplitComparisonUtilTest.java index 57573131c832..4328545ecc55 100644 --- a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/SplitComparisonUtilTest.java +++ b/platform/diff-impl/tests/com/intellij/diff/comparison/SplitComparisonUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; // TODO public class SplitComparisonUtilTest extends ComparisonUtilTestBase { diff --git a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/WordComparisonUtilTest.java b/platform/diff-impl/tests/com/intellij/diff/comparison/WordComparisonUtilTest.java similarity index 99% rename from platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/WordComparisonUtilTest.java rename to platform/diff-impl/tests/com/intellij/diff/comparison/WordComparisonUtilTest.java index f1f9e2126cc4..667ee8fa8f9c 100644 --- a/platform/diff-impl/tests/com/intellij/openapi/util/diff/comparison/WordComparisonUtilTest.java +++ b/platform/diff-impl/tests/com/intellij/diff/comparison/WordComparisonUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.comparison; +package com.intellij.diff.comparison; public class WordComparisonUtilTest extends ComparisonUtilTestBase { public void testSimpleCases() { diff --git a/platform/diff-impl/tests/com/intellij/openapi/util/diff/tools/fragmented/LineNumberConvertorTest.java b/platform/diff-impl/tests/com/intellij/diff/tools/fragmented/LineNumberConvertorTest.java similarity index 98% rename from platform/diff-impl/tests/com/intellij/openapi/util/diff/tools/fragmented/LineNumberConvertorTest.java rename to platform/diff-impl/tests/com/intellij/diff/tools/fragmented/LineNumberConvertorTest.java index 1302e3f6a8df..95fbf0e6de43 100644 --- a/platform/diff-impl/tests/com/intellij/openapi/util/diff/tools/fragmented/LineNumberConvertorTest.java +++ b/platform/diff-impl/tests/com/intellij/diff/tools/fragmented/LineNumberConvertorTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.util.diff.tools.fragmented; +package com.intellij.diff.tools.fragmented; import com.intellij.testFramework.UsefulTestCase; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/DirectoryHistoryDialog.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/DirectoryHistoryDialog.java index 68c3827bb77b..a728bf30d310 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/DirectoryHistoryDialog.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/DirectoryHistoryDialog.java @@ -25,7 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.DiffDialogHints; +import com.intellij.diff.DiffDialogHints; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.actions.ShowDiffUIContext; import com.intellij.openapi.vcs.changes.actions.diff.ShowDiffAction; diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java index fc181c762555..b04a07ddfdcd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java @@ -18,6 +18,13 @@ package com.intellij.openapi.fileEditor.impl; import com.intellij.AppTopics; import com.intellij.CommonBundle; import com.intellij.codeStyle.CodeStyleFacade; +import com.intellij.diff.DiffContentFactory; +import com.intellij.diff.DiffManager; +import com.intellij.diff.DiffRequestPanel; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; +import com.intellij.diff.util.DiffUserDataKeys; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.AccessToken; import com.intellij.openapi.application.ApplicationManager; @@ -46,13 +53,6 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.DiffRequestPanel; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.*; diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml index d0cec6192cd5..12b04f4096cc 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml @@ -242,6 +242,6 @@ - + diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 1ddc6aa098d1..0188f66b8eb5 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -1,7 +1,7 @@ - + @@ -81,20 +81,20 @@ serviceImplementation="com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl"/> - - - - - + + + + + + instance="com.intellij.diff.settings.DiffSettingsConfigurable"/> + instance="com.intellij.diff.settings.ExternalDiffSettingsConfigurable"/> diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml index 46c761dbf0ca..77922681d5a0 100644 --- a/platform/platform-resources/src/idea/PlatformActions.xml +++ b/platform/platform-resources/src/idea/PlatformActions.xml @@ -154,9 +154,9 @@ - - - + + + diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffRequestProcessor.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffRequestProcessor.java index 31ae9aa448ff..769c9ca787f9 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffRequestProcessor.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffRequestProcessor.java @@ -1,20 +1,17 @@ package com.intellij.execution.testframework.actions; +import com.intellij.diff.DiffContentFactory; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.impl.DiffRequestProcessor; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.ErrorDiffRequest; +import com.intellij.diff.requests.NoDiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.testframework.stacktrace.DiffHyperlink; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.UserDataHolderBase; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.impl.DiffRequestProcessor; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.ErrorDiffRequest; -import com.intellij.openapi.util.diff.requests.NoDiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/ViewAssertEqualsDiffAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/ViewAssertEqualsDiffAction.java index 5e7cc57a286a..a97944631319 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/ViewAssertEqualsDiffAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/ViewAssertEqualsDiffAction.java @@ -25,10 +25,10 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.WindowWrapper; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.impl.DiffRequestProcessor; -import com.intellij.openapi.util.diff.impl.DiffWindowBase; -import com.intellij.openapi.util.diff.util.DiffUtil; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.impl.DiffRequestProcessor; +import com.intellij.diff.impl.DiffWindowBase; +import com.intellij.diff.util.DiffUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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 ba9c4da69a2d..2c64e9abfc16 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 @@ -15,6 +15,15 @@ */ 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.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.Side; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.progress.ProcessCanceledException; @@ -24,15 +33,6 @@ import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.Side; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.BackgroundFromStartOption; import com.intellij.openapi.vcs.changes.BinaryContentRevision; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java index e9ce86186fc3..afb1694e3b48 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java @@ -26,8 +26,8 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; import com.intellij.openapi.ui.MessageType; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.util.DiffUserDataKeysEx; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.util.DiffUserDataKeysEx; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.annotate.FileAnnotation; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/CacheChangeProcessor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/CacheChangeProcessor.java index b2b6bc8aa287..ce05a0757843 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/CacheChangeProcessor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/CacheChangeProcessor.java @@ -25,14 +25,14 @@ import com.intellij.openapi.progress.util.ProgressWindow; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.impl.DiffRequestProcessor; -import com.intellij.openapi.util.diff.requests.*; -import com.intellij.openapi.util.diff.tools.util.SoftHardCacheMap; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.impl.DiffRequestProcessor; +import com.intellij.diff.requests.*; +import com.intellij.diff.tools.util.SoftHardCacheMap; import org.intellij.lang.annotations.CalledInBackground; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy; -import com.intellij.openapi.util.diff.util.WaitingBackgroundableTaskExecutor; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy; +import com.intellij.diff.util.WaitingBackgroundableTaskExecutor; import com.intellij.openapi.vcs.changes.actions.diff.ChangeDiffRequestPresentable; import com.intellij.util.containers.Convertor; import org.jetbrains.annotations.Contract; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java index 4fc48080a3d5..27c01512edba 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java @@ -39,9 +39,9 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.SimpleToolWindowPanel; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.*; -import com.intellij.openapi.util.diff.util.DiffPlaces; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUtil; +import com.intellij.diff.util.DiffPlaces; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsBundle; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestChain.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestChain.java index 4129542896b4..20c0997e075e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestChain.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestChain.java @@ -2,8 +2,8 @@ package com.intellij.openapi.vcs.changes.actions.diff; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.util.UserDataHolderBase; -import com.intellij.openapi.util.diff.actions.impl.GoToChangePopupBuilder; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; +import com.intellij.diff.actions.impl.GoToChangePopupBuilder; +import com.intellij.diff.chains.DiffRequestChain; import com.intellij.openapi.vcs.changes.Change; import com.intellij.util.Consumer; import com.intellij.util.Function; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestPresentable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestPresentable.java index 90979f4e8108..5c9ba49f12c3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestPresentable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestPresentable.java @@ -16,6 +16,16 @@ package com.intellij.openapi.vcs.changes.actions.diff; import com.intellij.CommonBundle; +import com.intellij.diff.DiffContentFactory; +import com.intellij.diff.chains.DiffRequestPresentable; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.impl.DiffViewerWrapper; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.ErrorDiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.Side; import com.intellij.openapi.actionSystem.DataProvider; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; @@ -30,16 +40,6 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentable; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.impl.DiffViewerWrapper; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.ErrorDiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.Side; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.vcs.*; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProvider.java index 60ce5da15224..e81c49748917 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProvider.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffRequestProvider.java @@ -20,8 +20,8 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.vcs.changes.Change; import com.intellij.util.ThreeState; import org.jetbrains.annotations.NotNull; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffViewerWrapperProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffViewerWrapperProvider.java index 470d343ddda9..dcb7a6bd8d1b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffViewerWrapperProvider.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeDiffViewerWrapperProvider.java @@ -20,8 +20,8 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.impl.DiffViewerWrapper; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.impl.DiffViewerWrapper; import com.intellij.openapi.vcs.changes.Change; import com.intellij.util.ThreeState; import org.jetbrains.annotations.NotNull; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeGoToChangePopupAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeGoToChangePopupAction.java index f42ca9e37c41..2e5b6dfd2c30 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeGoToChangePopupAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ChangeGoToChangePopupAction.java @@ -7,8 +7,8 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.diff.actions.impl.GoToChangePopupBuilder; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; +import com.intellij.diff.actions.impl.GoToChangePopupBuilder; +import com.intellij.diff.chains.DiffRequestChain; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ui.ChangesBrowser; import com.intellij.openapi.wm.IdeFocusManager; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/FileAwareDocumentContent.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/FileAwareDocumentContent.java index eec029349062..da6f23a42261 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/FileAwareDocumentContent.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/FileAwareDocumentContent.java @@ -1,16 +1,15 @@ package com.intellij.openapi.vcs.changes.actions.diff; +import com.intellij.diff.DiffContentFactory; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContentImpl; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.fileTypes.PlainTextFileType; -import com.intellij.openapi.fileTypes.UnknownFileType; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContentImpl; -import com.intellij.openapi.util.diff.DiffContentFactory; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ShowDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ShowDiffAction.java index b2794399d612..72160642ec97 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ShowDiffAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ShowDiffAction.java @@ -26,10 +26,10 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManager; +import com.intellij.diff.chains.DiffRequestChain; +import com.intellij.diff.util.DiffUserDataKeys; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.*; import com.intellij.openapi.vcs.changes.actions.ShowDiffUIContext; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ShowDiffContext.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ShowDiffContext.java index 9ffb716fa73b..d0ece0da86f5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ShowDiffContext.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/diff/ShowDiffContext.java @@ -17,7 +17,7 @@ package com.intellij.openapi.vcs.changes.actions.diff; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.diff.DiffDialogHints; +import com.intellij.diff.DiffDialogHints; import com.intellij.openapi.vcs.changes.Change; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java index e395e43c6493..40faf23ef54a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java @@ -24,9 +24,9 @@ import com.intellij.openapi.diff.impl.external.BinaryDiffTool; import com.intellij.openapi.diff.impl.external.DiffManagerImpl; import com.intellij.openapi.diff.impl.external.FrameDiffTool; import com.intellij.openapi.ui.WindowWrapper; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManager; +import com.intellij.diff.chains.DiffRequestChain; import org.jetbrains.annotations.NotNull; import java.awt.*; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java index d4627150e36b..30fa2a01930c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java @@ -17,20 +17,20 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.UserDataHolder; import com.intellij.openapi.util.UserDataHolderBase; -import com.intellij.openapi.util.diff.actions.impl.GoToChangePopupBuilder; -import com.intellij.openapi.util.diff.chains.DiffRequestChain; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentable; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.chains.SimpleDiffRequestChain; -import com.intellij.openapi.util.diff.contents.BinaryFileContentImpl; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContentImpl; -import com.intellij.openapi.util.diff.contents.EmptyContent; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.ErrorDiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; -import com.intellij.openapi.util.diff.util.DiffUserDataKeysEx; +import com.intellij.diff.actions.impl.GoToChangePopupBuilder; +import com.intellij.diff.chains.DiffRequestChain; +import com.intellij.diff.chains.DiffRequestPresentable; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.chains.SimpleDiffRequestChain; +import com.intellij.diff.contents.BinaryFileContentImpl; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContentImpl; +import com.intellij.diff.contents.EmptyContent; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.ErrorDiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; +import com.intellij.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffUserDataKeysEx; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.changes.Change; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java index fdd13c72d769..60e1c64d415c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java @@ -20,8 +20,8 @@ import com.intellij.openapi.actionSystem.ex.CheckboxAction; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.util.DiffUserDataKeysEx; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.util.DiffUserDataKeysEx; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsDataKeys; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index 62a83130a2b6..1284c410cd6e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -31,8 +31,8 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.diff.util.DiffPlaces; -import com.intellij.openapi.util.diff.util.DiffUserDataKeys; +import com.intellij.diff.util.DiffPlaces; +import com.intellij.diff.util.DiffUserDataKeys; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.*; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java index 24115d56bada..0fac6e9e3b53 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java @@ -15,20 +15,20 @@ */ package com.intellij.openapi.vcs.ex; +import com.intellij.diff.DiffContentFactory; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManager; +import com.intellij.diff.actions.DocumentFragmentContent; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.actions.DocumentFragmentContent; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; 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 adffe118ece7..25a8c75dbd0b 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 @@ -15,8 +15,13 @@ */ 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.contents.DiffContent; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.editor.Document; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Task; @@ -24,12 +29,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Couple; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsException; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java index b748ae4c9fbe..27da3bba1b80 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffAction.java @@ -23,7 +23,7 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Pair; -import com.intellij.openapi.util.diff.DiffDialogHints; +import com.intellij.diff.DiffDialogHints; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.Change; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java index 0c9a8fa3f6f1..3f97a8e3df29 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/actions/XCompareWithClipboardAction.java @@ -15,11 +15,11 @@ */ package com.intellij.xdebugger.impl.ui.tree.actions; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManager; +import com.intellij.diff.DiffRequestFactory; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.DiffRequestFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; import com.intellij.util.ui.UIUtil; import com.intellij.xdebugger.impl.ui.tree.XDebuggerTree; diff --git a/plugins/commander/src/com/intellij/ide/commander/Commander.java b/plugins/commander/src/com/intellij/ide/commander/Commander.java index 5dca32f544da..8dae70fae173 100644 --- a/plugins/commander/src/com/intellij/ide/commander/Commander.java +++ b/plugins/commander/src/com/intellij/ide/commander/Commander.java @@ -33,7 +33,7 @@ import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.diff.actions.CompareFilesAction; +import com.intellij.diff.actions.CompareFilesAction; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.openapi.wm.FocusWatcher; diff --git a/plugins/commander/src/com/intellij/ide/commander/PsiDiffContentFactory.java b/plugins/commander/src/com/intellij/ide/commander/PsiDiffContentFactory.java index 8e171dde5f89..27e94a466719 100644 --- a/plugins/commander/src/com/intellij/ide/commander/PsiDiffContentFactory.java +++ b/plugins/commander/src/com/intellij/ide/commander/PsiDiffContentFactory.java @@ -15,15 +15,15 @@ */ package com.intellij.ide.commander; +import com.intellij.diff.DiffContentFactory; +import com.intellij.diff.actions.DocumentFragmentContent; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.DocumentContent; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.diff.actions.DocumentFragmentContent; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.DocumentContent; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml index db217795bd25..fe98afcc4dcc 100644 --- a/plugins/svn4idea/src/META-INF/plugin.xml +++ b/plugins/svn4idea/src/META-INF/plugin.xml @@ -155,9 +155,9 @@ - - - + + + diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java index 99b041952665..363fcd842044 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractShowPropertiesDiffAction.java @@ -24,8 +24,8 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; +import com.intellij.diff.DiffDialogHints; +import com.intellij.diff.DiffManager; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.FilePath; 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 4a7065b58f67..0b6020b815cb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/diff/FileWithBranchComparer.java @@ -15,16 +15,16 @@ */ 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.requests.DiffRequest; +import com.intellij.diff.requests.SimpleDiffRequest; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; -import com.intellij.openapi.util.diff.DiffDialogHints; -import com.intellij.openapi.util.diff.DiffManager; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.DiffContentFactory; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.SimpleDiffRequest; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.changes.actions.diff.FileAwareDocumentContent; import com.intellij.openapi.vfs.CharsetToolkit; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnChangeDiffViewerProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnChangeDiffViewerProvider.java index af595d63a2bd..ff370a0e118c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnChangeDiffViewerProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnChangeDiffViewerProvider.java @@ -5,9 +5,9 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.impl.DiffViewerWrapper; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.impl.DiffViewerWrapper; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.changes.Change; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffSettingsHolder.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffSettingsHolder.java index 821618217876..2a8411624a4c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffSettingsHolder.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffSettingsHolder.java @@ -5,8 +5,8 @@ import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.diff.util.DiffPlaces; -import com.intellij.openapi.util.diff.util.DiffUtil; +import com.intellij.diff.util.DiffPlaces; +import com.intellij.diff.util.DiffUtil; import com.intellij.util.containers.HashMap; import com.intellij.util.xmlb.annotations.MapAnnotation; import org.jetbrains.annotations.NotNull; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffViewer.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffViewer.java index f7281745065c..6dd63167798e 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffViewer.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffViewer.java @@ -12,16 +12,16 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.UserDataHolderBase; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool.DiffViewer; -import com.intellij.openapi.util.diff.api.FrameDiffTool.ToolbarComponents; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.EmptyContent; -import com.intellij.openapi.util.diff.impl.ModifiablePanel; -import com.intellij.openapi.util.diff.requests.DiffRequest; -import com.intellij.openapi.util.diff.requests.ErrorDiffRequest; -import com.intellij.openapi.util.diff.tools.ErrorDiffTool; -import com.intellij.openapi.util.diff.util.DiffUtil; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool.DiffViewer; +import com.intellij.diff.FrameDiffTool.ToolbarComponents; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.EmptyContent; +import com.intellij.diff.impl.ModifiablePanel; +import com.intellij.diff.requests.DiffRequest; +import com.intellij.diff.requests.ErrorDiffRequest; +import com.intellij.diff.tools.ErrorDiffTool; +import com.intellij.diff.util.DiffUtil; import com.intellij.ui.EditorNotificationPanel; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffViewerWrapper.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffViewerWrapper.java index b30289dc88d0..32c1be6d128b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffViewerWrapper.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnDiffViewerWrapper.java @@ -1,9 +1,9 @@ package org.jetbrains.idea.svn.difftool; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool.DiffViewer; -import com.intellij.openapi.util.diff.impl.DiffViewerWrapper; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool.DiffViewer; +import com.intellij.diff.impl.DiffViewerWrapper; +import com.intellij.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; public class SvnDiffViewerWrapper implements DiffViewerWrapper { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnPhantomChangeDiffRequestProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnPhantomChangeDiffRequestProvider.java index 7c9e288c560d..bb30522dbd6b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnPhantomChangeDiffRequestProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnPhantomChangeDiffRequestProvider.java @@ -4,10 +4,10 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.actions.diff.ChangeDiffRequestPresentable; import com.intellij.openapi.vcs.changes.actions.diff.ChangeDiffRequestProvider; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnTreeConflictDiffRequestProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnTreeConflictDiffRequestProvider.java index dbe77cf5664b..d06c0007b3cb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnTreeConflictDiffRequestProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnTreeConflictDiffRequestProvider.java @@ -5,11 +5,11 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.UserDataHolder; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException; -import com.intellij.openapi.util.diff.impl.ModifiablePanel; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.chains.DiffRequestPresentableException; +import com.intellij.diff.impl.ModifiablePanel; +import com.intellij.diff.requests.DiffRequest; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.actions.diff.ChangeDiffRequestPresentable; import com.intellij.openapi.vcs.changes.actions.diff.ChangeDiffRequestProvider; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/PropertiesTableModel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/PropertiesTableModel.java index 8e66bdd23889..d8a035f37d39 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/PropertiesTableModel.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/PropertiesTableModel.java @@ -7,12 +7,12 @@ import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.editor.impl.DocumentImpl; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.diff.fragments.DiffFragment; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.util.DiffDrawUtil; -import com.intellij.openapi.util.diff.util.DiffUtil; -import com.intellij.openapi.util.diff.util.Side; -import com.intellij.openapi.util.diff.util.TextDiffType; +import com.intellij.diff.fragments.DiffFragment; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.util.DiffDrawUtil; +import com.intellij.diff.util.DiffUtil; +import com.intellij.diff.util.Side; +import com.intellij.diff.util.TextDiffType; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.FileStatus; import com.intellij.ui.EditorSettingsProvider; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffRequest.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffRequest.java index 768f1e63ef4e..faa8044d8ea7 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffRequest.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffRequest.java @@ -2,9 +2,9 @@ package org.jetbrains.idea.svn.difftool.properties; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileTypes.FileType; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.contents.EmptyContent; -import com.intellij.openapi.util.diff.requests.ContentDiffRequest; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.contents.EmptyContent; +import com.intellij.diff.requests.ContentDiffRequest; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.properties.PropertyData; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffTool.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffTool.java index 00406deeccd3..5f599aa4b55b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffTool.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffTool.java @@ -1,8 +1,8 @@ package org.jetbrains.idea.svn.difftool.properties; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool; -import com.intellij.openapi.util.diff.requests.DiffRequest; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool; +import com.intellij.diff.requests.DiffRequest; import org.jetbrains.annotations.NotNull; public class SvnPropertiesDiffTool implements FrameDiffTool { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java index 2f851c9f41e8..bef4e01f38c1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/properties/SvnPropertiesDiffViewer.java @@ -4,16 +4,16 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Couple; -import com.intellij.openapi.util.diff.api.DiffContext; -import com.intellij.openapi.util.diff.api.FrameDiffTool.DiffViewer; -import com.intellij.openapi.util.diff.api.FrameDiffTool.ToolbarComponents; -import com.intellij.openapi.util.diff.comparison.ComparisonPolicy; -import com.intellij.openapi.util.diff.comparison.ComparisonUtil; -import com.intellij.openapi.util.diff.comparison.DiffTooBigException; -import com.intellij.openapi.util.diff.comparison.TrimUtil; -import com.intellij.openapi.util.diff.contents.DiffContent; -import com.intellij.openapi.util.diff.fragments.LineFragment; -import com.intellij.openapi.util.diff.fragments.LineFragmentImpl; +import com.intellij.diff.DiffContext; +import com.intellij.diff.FrameDiffTool.DiffViewer; +import com.intellij.diff.FrameDiffTool.ToolbarComponents; +import com.intellij.diff.comparison.ComparisonPolicy; +import com.intellij.diff.comparison.ComparisonUtil; +import com.intellij.diff.comparison.DiffTooBigException; +import com.intellij.diff.comparison.TrimUtil; +import com.intellij.diff.contents.DiffContent; +import com.intellij.diff.fragments.LineFragment; +import com.intellij.diff.fragments.LineFragmentImpl; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.table.TableView;