commit 8880f4a5daf5902401d204c82cdfff4a788f64a2
author Michael Valenta <mvalenta> Tue Jan 17 18:45:21 2006 +0000
committer Michael Valenta <mvalenta> Tue Jan 17 18:45:21 2006 +0000
tree 3ee1f5a2eb250b2b5fce59cedf48a15f1d9972a8
parent 9cbfa35785dac26017efa1ca44693620dc51bae3

Adapt to changes made to IActionBars

bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPagePane.java

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPagePane.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPagePane.java
index 60bd611..2ecc705 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPagePane.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPagePane.java
@@ -25,6 +25,7 @@
 import org.eclipse.team.internal.ui.synchronize.SynchronizePageConfiguration;
 import org.eclipse.ui.*;
 import org.eclipse.ui.part.IPageBookViewPage;
+import org.eclipse.ui.services.IServiceLocator;
 
 /**
  * Standalone presentation of a participant page within a view pane. This
@@ -205,6 +206,9 @@
 
 				public void updateActionBars() {
 				}
+				public IServiceLocator getServiceLocator() {
+					return null;
+				}
 			};
 		}
 	}

bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java
index 22dab18..3126153 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java
@@ -41,6 +41,7 @@
 import org.eclipse.ui.commands.*;
 import org.eclipse.ui.part.IPageBookViewPage;
 import org.eclipse.ui.progress.IProgressService;
+import org.eclipse.ui.services.IServiceLocator;
 
 /**
  * Displays a synchronize participant page combined with the compare/merge infrastructure. This only works if the
@@ -524,6 +525,9 @@
 				}
 				public void updateActionBars() {
 				}
+				public IServiceLocator getServiceLocator() {
+					return null;
+				}
 			};
 		}
 	}