From 040752a9c61896f18cb4751c818df52c301670bb Mon Sep 17 00:00:00 2001 From: Olesya Smirnova Date: Tue, 18 Jan 2005 20:46:32 +0300 Subject: [PATCH] zx --- .../openapi}/ui/SelectFromListDialog.java | 7 ++-- .../cvsSupport2/CvsUpdateEnvironment.java | 4 +-- .../ui/CorruptedProjectFilesDialog.java | 34 +++++++++++-------- .../vcs/impl/ProjectLevelVcsManagerImpl.java | 2 +- 4 files changed, 24 insertions(+), 23 deletions(-) rename {plugins/cvs2/source/com/intellij/cvsSupport2 => openapi/src/com/intellij/openapi}/ui/SelectFromListDialog.java (94%) diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/ui/SelectFromListDialog.java b/openapi/src/com/intellij/openapi/ui/SelectFromListDialog.java similarity index 94% rename from plugins/cvs2/source/com/intellij/cvsSupport2/ui/SelectFromListDialog.java rename to openapi/src/com/intellij/openapi/ui/SelectFromListDialog.java index 62431225918e..0ae40fb10300 100644 --- a/plugins/cvs2/source/com/intellij/cvsSupport2/ui/SelectFromListDialog.java +++ b/openapi/src/com/intellij/openapi/ui/SelectFromListDialog.java @@ -1,7 +1,6 @@ -package com.intellij.cvsSupport2.ui; +package com.intellij.openapi.ui; import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleTextAttributes; @@ -10,9 +9,7 @@ import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -/** - * author: lesya - */ + public class SelectFromListDialog extends DialogWrapper { private final ToStringAspect myToStringAspect; private final DefaultListModel myModel = new DefaultListModel(); diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/CvsUpdateEnvironment.java b/plugins/cvs2/source/com/intellij/cvsSupport2/CvsUpdateEnvironment.java index 78af2dd6f902..7d12a99f8773 100644 --- a/plugins/cvs2/source/com/intellij/cvsSupport2/CvsUpdateEnvironment.java +++ b/plugins/cvs2/source/com/intellij/cvsSupport2/CvsUpdateEnvironment.java @@ -31,7 +31,7 @@ */ package com.intellij.cvsSupport2; -import com.intellij.cvsSupport2.actions.InternalMergeAction; +import com.intellij.cvsSupport2.actions.CvsMergeAction; import com.intellij.cvsSupport2.actions.update.UpdateSettingsOnCvsConfiguration; import com.intellij.cvsSupport2.config.CvsConfiguration; import com.intellij.cvsSupport2.cvsExecution.CvsOperationExecutor; @@ -112,7 +112,7 @@ public class CvsUpdateEnvironment implements UpdateEnvironment { if (virtualFile != null) mergedFiles.add(virtualFile); } - new InternalMergeAction(mergedFiles.get(0), project, mergedFiles).actionPerformed(null); + new CvsMergeAction(mergedFiles.get(0), project, mergedFiles).actionPerformed(null); } diff --git a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java b/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java index 0c1036532763..ab2b5a625fcd 100644 --- a/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java +++ b/plugins/cvs2/source/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java @@ -1,20 +1,21 @@ package com.intellij.cvsSupport2.cvsoperations.cvsUpdate.ui; -import com.intellij.cvsSupport2.actions.InternalMergeAction; +import com.intellij.cvsSupport2.actions.CvsMergeAction; import com.intellij.cvsSupport2.config.CvsConfiguration; import com.intellij.cvsSupport2.cvsoperations.cvsUpdate.MergedWithConflictProjectOrModuleFile; -import com.intellij.cvsSupport2.errorHandling.CannotFindCvsRootException; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; +import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vcs.AbstractVcsHelper; +import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.util.Options; import javax.swing.*; @@ -22,6 +23,7 @@ import java.awt.event.ActionEvent; import java.io.*; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Iterator; public class CorruptedProjectFilesDialog extends DialogWrapper { @@ -160,20 +162,22 @@ public class CorruptedProjectFilesDialog extends DialogWrapper { public void actionPerformed(ActionEvent e) { try { - VirtualFile currentVirtualFile = getCurrentVirtualFile(); - InternalMergeAction internalMergeAction = new InternalMergeAction(currentVirtualFile, myProject, null); - Document conflictWasResolved = internalMergeAction.showMergeDialogForFile(new String(currentVirtualFile.contentsToCharArray()), - null); - if (conflictWasResolved != null) { - saveExternally(currentVirtualFile, conflictWasResolved); - onCurrentFileProcessed(false); + try { + VirtualFile currentVirtualFile = getCurrentVirtualFile(); + CvsMergeAction internalMergeAction = new CvsMergeAction(currentVirtualFile, myProject, null); + Document conflictWasResolved = internalMergeAction.showMergeDialogForFile(new String(currentVirtualFile.contentsToCharArray()), + null); + if (conflictWasResolved != null) { + saveExternally(currentVirtualFile, conflictWasResolved); + onCurrentFileProcessed(false); + } + } + catch (IOException e1) { + throw new VcsException(e1); } } - catch (CannotFindCvsRootException e1) { - LOG.error(e1); - } - catch (IOException e1) { - LOG.error(e1); + catch (VcsException e1) { + AbstractVcsHelper.getInstance(myProject).showErrors(new ArrayList(Collections.singleton(e1)), "Merge errors"); } } diff --git a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java index 88bbb11a8a34..a638a87c2c6b 100644 --- a/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java +++ b/source/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java @@ -418,7 +418,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme return result.toArray(new AbstractVcs[result.size()]); } - + public void addMessageToConsoleWindow(String message, TextAttributes attributes) { if (ApplicationManager.getApplication().isDispatchThread()) { getOrCreateConsoleContent(getContentManager());