Examples with ResolveTreeConflictWizard org.tigris.subversion.subclipse.ui.conflicts.ResolveTreeConflictWizard used on opensource projects

Example 1 with ResolveTreeConflictWizard

use of org.tigris.subversion.subclipse.ui.conflicts.ResolveTreeConflictWizard in project subclipse by subclipse.

the class ResolveActionWithChoices method execute.

protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
    boolean folderSelected = false;
    boolean propertyConflicts = false;
    boolean textConflicts = false;
    boolean treeConflicts = false;
    boolean treeConflictDialogShown = false;
    IResource[] resources = getSelectedResources();
    for (int i = 0; i < resources.length; i++) {
        if (resources[i] instanceof IContainer) {
            folderSelected = true;
        }
        if (!propertyConflicts || !textConflicts || !treeConflicts) {
            ISVNLocalResource resource = SVNWorkspaceRoot.getSVNResourceFor(resources[i]);
            try {
                LocalResourceStatus status = resource.getStatus();
                if (status != null && status.isPropConflicted())
                    propertyConflicts = true;
                if (status != null && status.isTextConflicted())
                    textConflicts = true;
                if (status != null && status.hasTreeConflict())
                    treeConflicts = true;
            } catch (SVNException e) {
                SVNUIPlugin.log(IStatus.ERROR, e.getMessage(), e);
            }
        }
    }
    if (resources.length == 1 && treeConflicts && !propertyConflicts && !textConflicts) {
        treeConflict = getTreeConflict(resources[0]);
        if (treeConflict != null) {
            ResolveTreeConflictWizard wizard = new ResolveTreeConflictWizard(treeConflict, getTargetPart());
            WizardDialog dialog = new SizePersistedWizardDialog(Display.getDefault().getActiveShell(), wizard, // $NON-NLS-1$
            "ResolveTreeConflict");
            if (dialog.open() != WizardDialog.OK)
                return;
            treeConflictDialogShown = true;
        }
    }
    if (resources.length > 1 && treeConflicts) {
        if (!MessageDialog.openConfirm(getShell(), Policy.bind("ResolveOperation.taskName"), Policy.bind("ResolveAction.confirmTreeConflicts")))
            // $NON-NLS-1$	//$NON-NLS-2$
            return;
        setResolution(ISVNConflictResolver.Choice.chooseMerged);
    } else if (!treeConflictDialogShown) {
        SvnWizardMarkResolvedPage markResolvedPage = new SvnWizardMarkResolvedPage(resources);
        markResolvedPage.setPropertyConflicts(propertyConflicts);
        markResolvedPage.setTreeConflicts(treeConflicts);
        SvnWizard wizard = new SvnWizard(markResolvedPage);
        SvnWizardDialog dialog = new SvnWizardDialog(getShell(), wizard);
        wizard.setParentDialog(dialog);
        if (dialog.open() == SvnWizardDialog.CANCEL)
            return;
        setResolution(markResolvedPage.getResolution());
    }
    if (!treeConflictDialogShown)
        super.execute(action);
}

Example 2 with ResolveTreeConflictWizard

use of org.tigris.subversion.subclipse.ui.conflicts.ResolveTreeConflictWizard in project subclipse by subclipse.

the class MergeViewResolveAction method execute.

protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
    boolean treeConflictDialogShown = false;
    boolean compare = false;
    mergePath = null;
    if (showDialog) {
        List resources = new ArrayList();
        Iterator iter = fSelection.iterator();
        boolean folderSelected = false;
        boolean textConflicts = false;
        boolean propertyConflicts = false;
        boolean treeConflicts = false;
        while (iter.hasNext()) {
            MergeResult mergeResult = null;
            Object selectedObject = iter.next();
            if (selectedObject instanceof MergeResult)
                mergeResult = (MergeResult) selectedObject;
            if (selectedObject instanceof MergeResultsFolder) {
                folderSelected = true;
                MergeResultsFolder mergeResultsFolder = (MergeResultsFolder) selectedObject;
                resources.add(mergeResultsFolder.getFolder());
                mergeResult = mergeResultsFolder.getMergeResult();
            }
            if (mergeResult != null && (mergeResult.hasTreeConflict() || mergeResult.isConflicted() || mergeResult.isPropertyConflicted())) {
                if (mergeResult.isConflicted())
                    textConflicts = true;
                if (mergeResult.isPropertyConflicted())
                    propertyConflicts = true;
                if (mergeResult.hasTreeConflict())
                    treeConflicts = true;
                if (!(selectedObject instanceof MergeResultsFolder)) {
                    resources.add(mergeResult.getResource());
                }
            }
        }
        if (resources.size() > 1) {
            if (!MessageDialog.openConfirm(getShell(), Messages.MergeViewResolveAction_confirm, Messages.MergeViewResolveAction_confirmMultiple))
                return;
            setResolution(ISVNConflictResolver.Choice.chooseMerged);
        } else if (treeConflicts) {
            IResource resource = (IResource) resources.get(0);
            treeConflict = getTreeConflict(resource);
            if (treeConflict == null) {
                String message = Messages.MergeViewResolveAction_confirmTreeConflict + resource.getName() + // $NON-NLS-1$
                "?";
                if (!MessageDialog.openConfirm(getShell(), Messages.MergeViewResolveAction_confirm, message))
                    return;
                setResolution(ISVNConflictResolver.Choice.chooseMerged);
            } else {
                ResolveTreeConflictWizard wizard = new ResolveTreeConflictWizard(treeConflict, getTargetPart());
                WizardDialog dialog = new SizePersistedWizardDialog(Display.getDefault().getActiveShell(), wizard, // $NON-NLS-1$
                "ResolveTreeConflict");
                if (dialog.open() != WizardDialog.OK)
                    return;
                treeConflictDialogShown = true;
                compare = wizard.isCompare();
                mergePath = wizard.getMergePath();
            }
        } else if (folderSelected) {
            IResource resource = (IResource) resources.get(0);
            String message = Messages.MergeViewResolveAction_confirmProperty + resource.getFullPath() + // $NON-NLS-1$
            "?";
            if (!MessageDialog.openConfirm(getShell(), Messages.MergeViewResolveAction_confirm, message))
                return;
            selectedResolution = ISVNConflictResolver.Choice.chooseMerged;
            setResolution(selectedResolution);
        } else {
            IResource[] resourceArray = new IResource[resources.size()];
            resources.toArray(resourceArray);
            DialogWizard dialogResolveWizard = new DialogWizard(DialogWizard.MARK_RESOLVED);
            dialogResolveWizard.setResources(resourceArray);
            dialogResolveWizard.setTextConflicts(textConflicts);
            dialogResolveWizard.setPropertyConflicts(propertyConflicts);
            dialogResolveWizard.setTreeConflicts(treeConflicts);
            MergeWizardDialog resolveDialog = new MergeWizardDialog(Display.getDefault().getActiveShell(), dialogResolveWizard);
            if (resolveDialog.open() == MergeWizardDialog.CANCEL)
                return;
            selectedResolution = dialogResolveWizard.getResolution();
            setResolution(selectedResolution);
        }
    }
    if (!treeConflictDialogShown)
        super.execute(action);
    ArrayList mergeOutputs = new ArrayList();
    Iterator iter = fSelection.iterator();
    while (iter.hasNext()) {
        MergeResult mergeResult = null;
        Object selectedObject = iter.next();
        if (selectedObject instanceof MergeResult)
            mergeResult = (MergeResult) selectedObject;
        if (selectedObject instanceof MergeResultsFolder) {
            MergeResultsFolder mergeResultsFolder = (MergeResultsFolder) selectedObject;
            mergeResult = mergeResultsFolder.getMergeResult();
        }
        if (mergeResult != null && (mergeResult.hasTreeConflict() || mergeResult.isConflicted() || mergeResult.isPropertyConflicted())) {
            if (!compare) {
                String conflictResolution = Integer.toString(selectedResolution);
                mergeResult.setConflictResolution(conflictResolution);
                mergeResult.setPropertyResolution(conflictResolution);
                mergeResult.setTreeConflictResolution(conflictResolution);
                if (mergePath != null) {
                    MergeResult[] allResults = mergeResult.getMergeOutput().getMergeResults();
                    for (MergeResult checkResult : allResults) {
                        if (checkResult.getResource().getLocation().toFile().equals(mergePath)) {
                            try {
                                LocalResourceStatus status = SVNProviderPlugin.getPlugin().getStatusCacheManager().getStatus(checkResult.getResource());
                                if (status.isTextConflicted()) {
                                    checkResult.setAction(MergeResult.ACTION_CONFLICT);
                                    checkResult.setConflictResolution(" ");
                                    checkResult.setError(true);
                                }
                            } catch (SVNException e) {
                            }
                            break;
                        }
                    }
                }
            }
            if (!mergeOutputs.contains(mergeResult.getMergeOutput()))
                mergeOutputs.add(mergeResult.getMergeOutput());
        }
    }
    iter = mergeOutputs.iterator();
    while (iter.hasNext()) {
        MergeOutput mergeOutput = (MergeOutput) iter.next();
        mergeOutput.store();
    }
    MergeResultsView.getView().refresh();
    iter = mergeOutputs.iterator();
    while (iter.hasNext()) {
        MergeOutput mergeOutput = (MergeOutput) iter.next();
        if (!mergeOutput.hasUnresolvedConflicts()) {
            DialogWizard dialogWizard = new DialogWizard(DialogWizard.CONFLICTS_RESOLVED);
            dialogWizard.setMergeOutput(mergeOutput);
            MergeWizardDialog dialog = new MergeWizardDialog(Display.getDefault().getActiveShell(), dialogWizard, true);
            if (dialog.open() != MergeWizardDialog.CANCEL)
                MergeResultsView.getView().refresh();
        }
    }
}