Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-07-09 15:55:25 +0000
committerMichael Valenta2003-07-09 15:55:25 +0000
commit0611a18f47f73c146e9a6e7502538c0f876d415e (patch)
tree5e4f4f67a15e150f9321c47d96a53a28841a9201 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal
parente387e6e92ba1dc7cecfbbdb863e1ba6f9fe1f7cc (diff)
downloadeclipse.platform.team-0611a18f47f73c146e9a6e7502538c0f876d415e.tar.gz
eclipse.platform.team-0611a18f47f73c146e9a6e7502538c0f876d415e.tar.xz
eclipse.platform.team-0611a18f47f73c146e9a6e7502538c0f876d415e.zip
Refactored to avoid initializing subscribers on startup
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
index 30e4d3f48..8853af27e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
@@ -80,7 +80,7 @@ public class MergeWizard extends Wizard {
TeamProvider.registerSubscriber(s);
}
});
- SyncViewer.showInActivePage(null /* no default page */);
+ SyncViewer.showInActivePage(null /* no default page */, s);
} catch (InvocationTargetException e) {
CVSUIPlugin.openError(getContainer().getShell(), null, null, e);
return false;

Back to the top