Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-01-31 22:10:37 -0500
committerJean Michel-Lemieux2004-01-31 22:10:37 -0500
commitf2bad65e8e786531e97cd103afb7c8fe2801f72c (patch)
tree06f8019b68670c937d1d3f39711604a7eea7d5f0
parent2e7a996ac24d77e2eee15d4119a9f47254217a98 (diff)
downloadeclipse.platform.team-f2bad65e8e786531e97cd103afb7c8fe2801f72c.tar.gz
eclipse.platform.team-f2bad65e8e786531e97cd103afb7c8fe2801f72c.tar.xz
eclipse.platform.team-f2bad65e8e786531e97cd103afb7c8fe2801f72c.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java8
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);

Back to the top