*** empty log message ***

5 files changed, 53 insertions, 12 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
index 1f112a684..09f981224 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
@@ -17,14 +17,19 @@ import org.eclipse.compare.CompareEditorInput;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
+import org.eclipse.team.core.subscribers.SyncInfo;
 import org.eclipse.team.internal.ui.dialogs.DetailsDialog;
 import org.eclipse.team.internal.ui.synchronize.compare.SyncInfoSetCompareInput;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoFilter;
 import org.eclipse.ui.help.WorkbenchHelp;
 
 /**
@@ -33,8 +38,12 @@ import org.eclipse.ui.help.WorkbenchHelp;
 public class ReleaseCommentDialog extends DetailsDialog {
 	
 	CommitCommentArea commitCommentArea;
+	//	dialogs settings that are persistent between workbench sessions
+	private IDialogSettings settings;
 	private IResource[] resourcesToCommit;
 	private CompareEditorInput compareEditorInput;
+	private static final String HEIGHT_KEY = "width-key";
+	private static final String WIDTH_KEY = "height-key";
 	
 	/**
 	 * ReleaseCommentDialog constructor.
@@ -50,6 +59,12 @@ public class ReleaseCommentDialog extends DetailsDialog {
 		// Get a project from which the commit template can be obtained
 		if (resourcesToCommit.length > 0) 
 		commitCommentArea.setProject(resourcesToCommit[0].getProject());
+		
+		IDialogSettings workbenchSettings = CVSUIPlugin.getPlugin().getDialogSettings();
+		this.settings = workbenchSettings.getSection("ReleaseCommentDialog");//$NON-NLS-1$
+		if (settings == null) {
+			this.settings = workbenchSettings.addNewSection("ReleaseCommentDialog");//$NON-NLS-1$
+		}		
 	}
 	
 	/*
@@ -69,7 +84,10 @@ public class ReleaseCommentDialog extends DetailsDialog {
 			}
 		});
 		
-		compareEditorInput = new SyncInfoSetCompareInput(new CompareConfiguration(), resourcesToCommit, CVSUIPlugin.getPlugin().getCvsWorkspaceSynchronizeParticipant().getInput());
+		CompareConfiguration cc = new CompareConfiguration();
+		cc.setLeftEditable(false);
+		SyncInfoFilter.SyncInfoDirectionFilter filter = new SyncInfoFilter.SyncInfoDirectionFilter(SyncInfo.OUTGOING);
+		compareEditorInput = new SyncInfoSetCompareInput(cc, resourcesToCommit, filter, CVSUIPlugin.getPlugin().getCvsWorkspaceSynchronizeParticipant().getInput());
 		
 		// set F1 help
 		WorkbenchHelp.setHelp(composite, IHelpContextIds.RELEASE_COMMENT_DIALOG);	
@@ -79,6 +97,21 @@ public class ReleaseCommentDialog extends DetailsDialog {
 	}
 
 	/**
+	 * @see Window#getInitialSize()
+	 */
+	protected Point getInitialSize() {
+		int width, height;
+		try {
+			height = settings.getInt(HEIGHT_KEY);
+			width = settings.getInt(WIDTH_KEY);
+		} catch(NumberFormatException e) {
+			return super.getInitialSize();
+		}
+		Point p = super.getInitialSize();
+		return new Point(width, p.y);
+	}
+	
+	/**
 	 * Returns the comment.
 	 * @return String
 	 */
@@ -115,15 +148,16 @@ public class ReleaseCommentDialog extends DetailsDialog {
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#updateEnablements()
 	 */
-	protected void updateEnablements() {
-		// TODO Auto-generated method stub
-		
+	protected void updateEnablements() {	
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.window.Window#close()
 	 */
 	public boolean close() {
+		Rectangle bounds = getShell().getBounds();
+		settings.put(HEIGHT_KEY, bounds.height);
+		settings.put(WIDTH_KEY, bounds.width);
 		return super.close();
 	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
index 12ba01e98..258c8f214 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
@@ -32,14 +32,14 @@ import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager;
 import org.eclipse.team.internal.ui.actions.TeamAction;
 import org.eclipse.team.internal.ui.dialogs.IPromptCondition;
 import org.eclipse.team.ui.synchronize.SyncInfoDiffNode;
-import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.*;
 
 /**
  * CVSAction is the common superclass for all CVS actions. It provides
  * facilities for enablement handling, standard error handling, selection
  * retrieval and prompting.
  */
-abstract public class CVSAction extends TeamAction {
+abstract public class CVSAction extends TeamAction implements IEditorActionDelegate {
 	
 	private List accumulatedStatus = new ArrayList();
 	
@@ -475,9 +475,12 @@ abstract public class CVSAction extends TeamAction {
 				Object adapter = getAdapter(element, IResource.class);
 				if (adapter instanceof IResource) {
 					resources.add(adapter);
-}
+				}
 			}
 		}
 		return (IResource[]) resources.toArray(new IResource[resources.size()]);
-	}	
+	}
+	
+	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
+	}
 }
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 d164815c1..1c57284f6 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
@@ -19,7 +19,6 @@ 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;
 import org.eclipse.team.internal.ccvs.ui.CVSLightweightDecorator;
 import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
 import org.eclipse.team.ui.synchronize.*;
@@ -38,9 +37,8 @@ public class CVSSynchronizeViewPage extends TeamSubscriberParticipantPage implem
 		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();
+				IResource resource =  ((SyncInfoDiffNode)element).getResource();
+				if(resource != null) {
 					CVSLightweightDecorator.Decoration decoration = new CVSLightweightDecorator.Decoration();
 					CVSLightweightDecorator.decorateTextLabel((IResource) resource, decoration, false, true);
 					StringBuffer output = new StringBuffer(25);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizePage.java
index 5d9fb10e4..68fddeb57 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizePage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizePage.java
@@ -33,6 +33,9 @@ public class MergeSynchronizePage extends CVSSynchronizeViewPage {
 		
 		Utils.initAction(updateAdapter, "action.SynchronizeViewUpdate.", Policy.getBundle()); //$NON-NLS-1$
 		getParticipant().setMode(TeamSubscriberParticipant.INCOMING_MODE);
+		
+		// force enablement to be update on action delegates
+		syncSetChanged(null);
 	}
 	
 	/* (non-Javadoc)
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizePage.java
index 6d705548d..7b3e45c3b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizePage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizePage.java
@@ -33,6 +33,9 @@ public class WorkspaceSynchronizePage extends CVSSynchronizeViewPage {
 
 		Utils.initAction(commitToolbar, "action.SynchronizeViewCommit.", Policy.getBundle()); //$NON-NLS-1$
 		Utils.initAction(updateToolbar, "action.SynchronizeViewUpdate.", Policy.getBundle()); //$NON-NLS-1$
+		
+		// force enablement to be update on action delegates
+		//syncSetChanged(null);
 	}
 
 	/* (non-Javadoc)