changelist conflict dialog refactored
commit2fa21cbfa700766baffc5042f0d2dca1681e464e
authorunknown <Dmitry.Avdeev@.Labs.IntelliJ.Net>
Wed, 7 Oct 2009 08:21:27 +0000 (7 12:21 +0400)
committerunknown <Dmitry.Avdeev@.Labs.IntelliJ.Net>
Wed, 7 Oct 2009 08:21:27 +0000 (7 12:21 +0400)
tree476f4ac84fc1d2608218584227b340b65d4807a5
parent9e9f4e85585de2bd0e5b3d5efe6cca1b9f8a3d7f
changelist conflict dialog refactored
platform/platform-api/src/com/intellij/ui/EditorNotificationPanel.java
platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/FileListRenderer.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictAccessProvider.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.form
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java [new file with mode: 0644]
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictResolution.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/MoveChangesDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java