*** empty log message ***

4 files changed, 80 insertions, 48 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewPage.java
index 09adefe3a..d164815c1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewPage.java
@@ -16,6 +16,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.*;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.team.core.subscribers.SyncInfo;
@@ -26,8 +27,50 @@ import org.eclipse.ui.IActionDelegate;
 
 public class CVSSynchronizeViewPage extends TeamSubscriberParticipantPage implements ISyncSetChangedListener {
 
+	private static class CVSLabelProvider extends LabelProvider implements IColorProvider {
+		private ILabelProvider oldLabelProvider;
+		public CVSLabelProvider(ILabelProvider oldLabelProvider) {
+			this.oldLabelProvider = oldLabelProvider;
+		}
+		public Image getImage(Object element) {
+			return oldLabelProvider.getImage(element);
+		}
+		public String getText(Object element) {
+			String text = oldLabelProvider.getText(element);
+			if (element instanceof SyncInfoDiffNode) {
+				SyncInfo info =  ((SyncInfoDiffNode)element).getSyncInfo();
+				if(info != null) {
+					IResource resource = info.getLocal();
+					CVSLightweightDecorator.Decoration decoration = new CVSLightweightDecorator.Decoration();
+					CVSLightweightDecorator.decorateTextLabel((IResource) resource, decoration, false, true);
+					StringBuffer output = new StringBuffer(25);
+					if(decoration.prefix != null) {
+						output.append(decoration.prefix);
+					}
+					output.append(text);
+					if(decoration.suffix != null) {
+						output.append(decoration.suffix);
+					}
+					return output.toString();
+				}
+			}
+			return text;
+		}
+		public Color getForeground(Object element) {
+			if(oldLabelProvider instanceof IColorProvider) {
+				return ((IColorProvider)oldLabelProvider).getForeground(element);
+			}
+			return null;
+		}
+		public Color getBackground(Object element) {
+			if(oldLabelProvider instanceof IColorProvider) {
+				return ((IColorProvider)oldLabelProvider).getBackground(element);
+			}
+			return null;
+		}
+	}
+	
 	private List delegates = new ArrayList(2);
-	private ILabelProvider oldLabelProvider;
 
 	protected class CVSActionDelegate extends Action {
 		private IActionDelegate delegate;
@@ -87,40 +130,6 @@ public class CVSSynchronizeViewPage extends TeamSubscriberParticipantPage implem
 		delegates.add(delagate);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.team.ui.synchronize.TeamSubscriberParticipantPage#getLabelProvider()
-	 */
-	protected ILabelProvider getLabelProvider(final ILabelProvider proxy) {
-		return new LabelProvider() {
-			public Image getImage(Object element) {
-				return proxy.getImage(element);
-			}
-			public String getText(Object element) {
-				String text = proxy.getText(element);
-				if (element instanceof SyncInfoDiffNode) {
-					SyncInfo info =  ((SyncInfoDiffNode)element).getSyncInfo();
-					if(info != null) {
-						IResource resource = info.getLocal();
-						CVSLightweightDecorator.Decoration decoration = new CVSLightweightDecorator.Decoration();
-						CVSLightweightDecorator.decorateTextLabel((IResource) resource, decoration, false, true);
-						StringBuffer output = new StringBuffer(25);
-						if(decoration.prefix != null) {
-							output.append(decoration.prefix);
-						}
-						output.append(text);
-						if(decoration.suffix != null) {
-							output.append(decoration.suffix);
-						}
-						return output.toString();
-					}
-				}
-				return text;
-			}
-		};
-	}
-
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
 	 */
@@ -149,7 +158,7 @@ public class CVSSynchronizeViewPage extends TeamSubscriberParticipantPage implem
 		// want all outgoing/repository icons in this view. Instead, we add 
 		// CVS specific information that is useful in the synchronizing context.
 		StructuredViewer viewer = (StructuredViewer)getChangesViewer();
-		oldLabelProvider = (ILabelProvider)viewer.getLabelProvider();
-		viewer.setLabelProvider(getLabelProvider(oldLabelProvider));		
+		ILabelProvider oldLabelProvider = (ILabelProvider)viewer.getLabelProvider();
+		viewer.setLabelProvider(new CVSLabelProvider(oldLabelProvider));		
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/RefreshUserNotificationPolicy.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/RefreshUserNotificationPolicy.java
index 34a1adc08..39d3e9780 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/RefreshUserNotificationPolicy.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/RefreshUserNotificationPolicy.java
@@ -50,9 +50,14 @@ public class RefreshUserNotificationPolicy implements IRefreshSubscriberListener
 			}
 		}
 		
+		// Change to incoming mode if changes are found.
+		if(infos.length > 0) {
+			event.getParticipant().setMode(TeamSubscriberParticipant.INCOMING_MODE);
+		}
+		// Prompt user if preferences are set for this type of refresh.
 		if(shouldPrompt) {
 			notifyIfNeededModal(event);
-		}
+		}		
 	}
 	
 	private void notifyIfNeededModal(final IRefreshEvent event) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
index 6ac0fafd6..6dee4e5df 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
@@ -47,6 +47,8 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
 	
 	private SynchronizePageDropDownAction fPageDropDown;
 	private SynchronizeViewWorkbenchPart fOverviewPage;
+
+	public static final boolean INCLUDE_OVERVIEWPAGE = false;
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
@@ -157,11 +159,18 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
 	 * @see org.eclipse.ui.part.PageBookView#createDefaultPage(org.eclipse.ui.part.PageBook)
 	 */
 	protected IPage createDefaultPage(PageBook book) {
-		SynchronizeOverviewPage overviewPage = new SynchronizeOverviewPage(this);
-		this.fOverviewPage = new SynchronizeViewWorkbenchPart(overviewPage, getSite());
-		overviewPage.createControl(getPageBook());
-		initPage(overviewPage);
-		return overviewPage;
+		if(INCLUDE_OVERVIEWPAGE) {
+			SynchronizeOverviewPage overviewPage = new SynchronizeOverviewPage(this);
+			this.fOverviewPage = new SynchronizeViewWorkbenchPart(overviewPage, getSite());
+			overviewPage.createControl(getPageBook());
+			initPage(overviewPage);
+			return overviewPage;
+		} else {
+			MessagePage page = new MessagePage();
+			page.createControl(getPageBook());
+			initPage(page);
+			return page;
+		}
 	}
 
 	/* (non-Javadoc)
@@ -201,7 +210,13 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
 							}
 							if (getParticipant() == null) {
 								ISynchronizeParticipant[] available = TeamUI.getSynchronizeManager().getSynchronizeParticipants();
-								displayOverviewPage();
+								if(INCLUDE_OVERVIEWPAGE) {
+									displayOverviewPage();
+								} else {
+									if (available.length > 0) {
+										display(available[available.length - 1]);
+									}
+								}
 							}
 						}
 					}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java
index 917e68bf6..875eae831 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java
@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.team.internal.ui.TeamUIPlugin;
 import org.eclipse.team.internal.ui.Utils;
+import org.eclipse.team.internal.ui.synchronize.SynchronizeView;
 import org.eclipse.team.ui.TeamUI;
 import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
 import org.eclipse.team.ui.synchronize.ISynchronizeParticipantListener;
@@ -89,10 +90,12 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato
 				action.setChecked(page.equals(current));
 				addActionToMenu(fMenu, action);
 			}
-			// Add Overview Page
-			addMenuSeparator();
-			addActionToMenu(fMenu, overviewPageAction);
-			overviewPageAction.setChecked(current == null);
+			if(SynchronizeView.INCLUDE_OVERVIEWPAGE) {
+				// 	Add Overview Page
+				addMenuSeparator();
+				addActionToMenu(fMenu, overviewPageAction);
+				overviewPageAction.setChecked(current == null);
+			}
 			return fMenu;
 		}