Hi,
I have implemened the following class ( see below). I have two questions that I hope to get some help with:
1. When saveChanges() is called how can I propagate a change it to a View ( extends ViewPart).
2. How can I make the diffmarks disappear when copied a change from right to left?
I would really appreciate your assistance.
Br,
//mike
package net.sourceforge.eclipseccase.ui.operation;
import org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener;
import java.io.OutputStream;
import java.io.InputStream;
import java.io.IOException;
import org.eclipse.compare.IStreamContentAccessor;
import org.eclipse.core.resources.IResource;
import java.io.File;
import java.io.FileOutputStream;
import org.eclipse.compare.structuremergeviewer.IDiffContainer;
import org.eclipse.compare.structuremergeviewer.IStructureComparator;
import org.eclipse.compare.structuremergeviewer.DiffNode;
import net.sourceforge.eclipseccase.ClearCasePlugin;
import org.eclipse.core.runtime.Status;
import org.eclipse.team.core.TeamException;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.compare.structuremergeviewer.Differencer;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.compare.ITypedElement;
import net.sourceforge.eclipseccase.ClearCaseProvider;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.core.resources.IFile;
import net.sourceforge.eclipseccase.ui.compare.ClearCaseResourceNode;
import org.eclipse.compare.CompareUI;
import org.eclipse.compare.ResourceNode;
import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.compare.CompareEditorInput;
public class VersionMergeInput extends CompareEditorInput {
private ITypedElement left;
private ITypedElement right;
private ITypedElement ancestor;
private boolean neverSaved = true;
private boolean isSaving = false;
private IFile resource;
private Object result;
public VersionMergeInput(CompareConfiguration configuration, IFile resource, String selected, String comparableVersion, String base, ClearCaseProvider provider) {
super(configuration);
this.resource = resource;
right = comparableVersion != null ? new ClearCaseResourceNode(resource, comparableVersion, provider) : new ResourceNode(resource);
// TODO: Invokers of this method should ensure that trees and contents
// are prefetched
left = new ResourceNode(resource);
ancestor = base != null ? new ClearCaseResourceNode(resource, base, provider) : new ResourceNode(resource);
configuration.setLeftImage(CompareUI.getImage(resource));
if (left != null) {
configuration.setLeftLabel(selected);
}
configuration.setRightImage(CompareUI.getImage(resource));
if (right != null) {
configuration.setRightLabel(comparableVersion);
}
configuration.setAncestorImage(CompareUI.getImage(resource));
if (ancestor != null) {
configuration.setAncestorLabel(base);
}
}
/*
* (non-Javadoc) Method declared on CompareEditorInput
*/
protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
final boolean threeWay = ancestor != null;
if (right == null || left == null) {
setMessage("different"); //$NON-NLS-1$
return null;
}
try {
// do the diff
Object result = null;
monitor.beginTask("Merging ...", 30); //$NON-NLS-1$
IProgressMonitor sub = new SubProgressMonitor(monitor, 30);
sub.beginTask("Merging...", 100); //$NON-NLS-1$
try {
// instead of just DiffNode
Differencer d = new Differencer() {
protected Object visit(Object data, int result, Object ancestor, Object left, Object right) {
return new MyDiffNode((IDiffContainer) data, result, (ITypedElement) ancestor, (ITypedElement) left, (ITypedElement) right);
}
};
result = d.findDifferences(threeWay, sub, null, ancestor, left, right);
} finally {
sub.done();
}
return result;
} catch (OperationCanceledException e) {
throw new InterruptedException(e.getMessage());
} catch (RuntimeException e) {
handle(e);
return null;
} finally {
monitor.done();
}
}
/**
* Handles a random exception and gives error message.
*/
private void handle(Exception e) {
// create a status
Throwable t = e;
// unwrap the invocation target exception
if (t instanceof InvocationTargetException) {
t = ((InvocationTargetException) t).getTargetException();
}
IStatus error;
if (t instanceof CoreException) {
error = ((CoreException) t).getStatus();
} else if (t instanceof TeamException) {
error = ((TeamException) t).getStatus();
} else {
error = new Status(IStatus.ERROR, ClearCasePlugin.PLUGIN_ID, 1, "Runtime Exception occurred", t); //$NON-NLS-1$
}
setMessage(error.getMessage());
if (!(t instanceof TeamException)) {
ClearCasePlugin.log(error.getSeverity(), error.getMessage(), t);
}
}
// save if any changes
public void saveChanges(IProgressMonitor pm) throws CoreException {
if (left instanceof IStreamContentAccessor) {
try {
isSaving = true;
super.saveChanges(pm);
//Since left is the only file editable.
IStreamContentAccessor sca = (IStreamContentAccessor) left;
InputStream contents = sca.getContents();
File f = new File(resource.getLocation().toOSString());
OutputStream out = new FileOutputStream(f);
byte buf[] = new byte[1024];
int len;
while ((len = contents.read(buf)) > 0)
out.write(buf, 0, len);
out.close();
neverSaved = false;
//FIXME: Mark as merged in table.
flushLeftViewers(pm);
((MyDiffNode) result).fireChange();
} catch (Exception e) {
} finally {
isSaving = false;
}
}
}
public boolean isSaveNeeded() {
if (neverSaved) {
return true;
} else {
return super.isSaveNeeded();
}
}
//FIXME: Mark as merged?!
public static class MyDiffNode extends DiffNode {
public MyDiffNode(IDiffContainer parent, int kind, ITypedElement ancestor, ITypedElement left, ITypedElement right) {
super(parent, kind, ancestor, left, right);
}
public void fireChange() {
super.fireChange();
}
}
}
