diff options
2 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java index 3954d3e64..19a816052 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java @@ -86,7 +86,7 @@ import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; import org.eclipse.team.internal.ccvs.ui.actions.MoveRemoteTagAction; import org.eclipse.team.internal.ccvs.ui.actions.OpenLogEntryAction; import org.eclipse.team.internal.ui.jobs.JobBusyCursor; -import org.eclipse.team.internal.ui.synchronize.compare.SyncInfoCompareInput; +import org.eclipse.team.ui.synchronize.SyncInfoCompareInput; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IActionDelegate; import org.eclipse.ui.IEditorInput; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java index d7dbf0537..731618974 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java @@ -69,7 +69,7 @@ public class CVSSynchronizeViewCompareConfiguration extends TeamSubscriberPageDi public void setGroupIncomingByComment(boolean enabled) { this.isGroupIncomingByComment = enabled; if(getParticipant().getMode() == TeamSubscriberParticipant.INCOMING_MODE) { - getViewer().setInput(getInput()); + setInput(getViewer()); } } @@ -94,7 +94,11 @@ public class CVSSynchronizeViewCompareConfiguration extends TeamSubscriberPageDi int newMode = ((Integer)event.getNewValue()).intValue(); if(newMode == TeamSubscriberParticipant.INCOMING_MODE || oldMode == TeamSubscriberParticipant.INCOMING_MODE) { - getViewer().setInput(getInput()); + aSyncExec(new Runnable() { + public void run() { + setInput(getViewer()); + } + }); } } super.propertyChange(event); |