Search in sources :

Example 11 with MergeResult

use of com.collabnet.subversion.merge.MergeResult in project subclipse by subclipse.

the class CopyFromMergeSourceAction method execute.

protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
    Iterator iter = selection.iterator();
    while (iter.hasNext()) {
        Object object = iter.next();
        if (object instanceof ISkippedMergeResult) {
            SVNRevision svnRevision = null;
            IResource resource = null;
            SVNUrl srcUrl = null;
            MergeResult mergeResult = null;
            if (object instanceof SkippedMergeResult) {
                SkippedMergeResult skippedMergeResult = (SkippedMergeResult) object;
                mergeResult = skippedMergeResult;
                MergeOptions mergeOptions = skippedMergeResult.getMergeOutput().getMergeOptions();
                svnRevision = mergeOptions.getToRevision();
                SVNUrl svnUrl = mergeOptions.getFromUrl();
                resource = skippedMergeResult.getResource();
                if (!resource.exists()) {
                    ISVNLocalResource svnResource = SVNWorkspaceRoot.getSVNResourceFor(resource);
                    String resourceSubString = resource.getFullPath().toOSString().substring(skippedMergeResult.getMergeOutput().getTarget().length() + 1);
                    if (!resourceSubString.startsWith("/"))
                        // $NON-NLS-1$ //$NON-NLS-2$
                        resourceSubString = "/" + resourceSubString;
                    try {
                        srcUrl = new SVNUrl(svnUrl.toString() + // $NON-NLS-1$ //$NON-NLS-2$
                        resourceSubString.replaceAll("\\\\", "/"));
                    } catch (MalformedURLException e) {
                        Activator.handleError(Messages.CopyFromMergeSourceAction_error, e);
                        MessageDialog.openError(getShell(), Messages.CopyFromMergeSourceAction_title, e.getLocalizedMessage());
                        return;
                    }
                }
            }
            if (object instanceof SkippedMergeResultsFolder) {
                SkippedMergeResultsFolder skippedMergeResultsFolder = (SkippedMergeResultsFolder) object;
                mergeResult = skippedMergeResultsFolder.getMergeResult();
                MergeOptions mergeOptions = skippedMergeResultsFolder.getMergeOutput().getMergeOptions();
                svnRevision = mergeOptions.getToRevision();
                SVNUrl svnUrl = mergeOptions.getFromUrl();
                resource = skippedMergeResultsFolder.getFolder();
                if (!resource.exists()) {
                    ISVNLocalResource svnResource = SVNWorkspaceRoot.getSVNResourceFor(resource);
                    String resourceSubString = resource.getFullPath().toOSString().substring(skippedMergeResultsFolder.getMergeOutput().getTarget().length() + 1);
                    if (!resourceSubString.startsWith("/"))
                        // $NON-NLS-1$ //$NON-NLS-2$
                        resourceSubString = "/" + resourceSubString;
                    try {
                        srcUrl = new SVNUrl(svnUrl.toString() + // $NON-NLS-1$ //$NON-NLS-2$
                        resourceSubString.replaceAll("\\\\", "/"));
                    } catch (MalformedURLException e) {
                        Activator.handleError(Messages.CopyFromMergeSourceAction_error2, e);
                        MessageDialog.openError(getShell(), Messages.CopyFromMergeSourceAction_title, e.getLocalizedMessage());
                        return;
                    }
                }
            }
            if (resource.exists()) {
                MessageDialog.openError(getShell(), Messages.CopyFromMergeSourceAction_title, resource.getName() + Messages.CopyFromMergeSourceAction_alreadyExists);
                return;
            }
            if (svnRevision == null)
                svnRevision = SVNRevision.HEAD;
            IResource[] resources = { resource };
            File destPath = new File(resource.getLocation().toOSString());
            CopyOperation copyOperation = new CopyOperation(getTargetPart(), resources, srcUrl, destPath, svnRevision, mergeResult);
            copyOperation.run();
        }
    }
}
Also used : MalformedURLException(java.net.MalformedURLException) SVNUrl(org.tigris.subversion.svnclientadapter.SVNUrl) SkippedMergeResult(com.collabnet.subversion.merge.SkippedMergeResult) MergeResult(com.collabnet.subversion.merge.MergeResult) ISkippedMergeResult(com.collabnet.subversion.merge.ISkippedMergeResult) SkippedMergeResultsFolder(com.collabnet.subversion.merge.SkippedMergeResultsFolder) ISVNLocalResource(org.tigris.subversion.subclipse.core.ISVNLocalResource) CopyOperation(com.collabnet.subversion.merge.CopyOperation) Iterator(java.util.Iterator) MergeOptions(com.collabnet.subversion.merge.MergeOptions) SVNRevision(org.tigris.subversion.svnclientadapter.SVNRevision) File(java.io.File) ISkippedMergeResult(com.collabnet.subversion.merge.ISkippedMergeResult) IResource(org.eclipse.core.resources.IResource) SkippedMergeResult(com.collabnet.subversion.merge.SkippedMergeResult) ISkippedMergeResult(com.collabnet.subversion.merge.ISkippedMergeResult)

Aggregations

MergeResult (com.collabnet.subversion.merge.MergeResult)11 MergeResultsFolder (com.collabnet.subversion.merge.MergeResultsFolder)6 Iterator (java.util.Iterator)6 MergeOutput (com.collabnet.subversion.merge.MergeOutput)5 ArrayList (java.util.ArrayList)4 IStructuredSelection (org.eclipse.jface.viewers.IStructuredSelection)4 AdaptableMergeResult (com.collabnet.subversion.merge.AdaptableMergeResult)3 IFile (org.eclipse.core.resources.IFile)3 IResource (org.eclipse.core.resources.IResource)3 ISVNLocalResource (org.tigris.subversion.subclipse.core.ISVNLocalResource)3 SVNRevision (org.tigris.subversion.svnclientadapter.SVNRevision)3 SVNUrl (org.tigris.subversion.svnclientadapter.SVNUrl)3 MergeOptions (com.collabnet.subversion.merge.MergeOptions)2 List (java.util.List)2 SVNException (org.tigris.subversion.subclipse.core.SVNException)2 AdaptableMergeResultsFolder (com.collabnet.subversion.merge.AdaptableMergeResultsFolder)1 CopyOperation (com.collabnet.subversion.merge.CopyOperation)1 ISkippedMergeResult (com.collabnet.subversion.merge.ISkippedMergeResult)1 MergeSummaryResult (com.collabnet.subversion.merge.MergeSummaryResult)1 SkippedMergeResult (com.collabnet.subversion.merge.SkippedMergeResult)1