support for #8574

10 files changed, 132 insertions, 42 deletions

diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index f7bbc1198..144f011ab 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,7 +11,7 @@
 <h1>

 Eclipse Platform Build Notes<br>

 Compare</h1>

-Eclipse Build Input January ??th 2002

+Eclipse Build Input January 29th 2002

 

 <h2>

 What's new in this drop</h2>

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index 5b294c778..6eeda5d56 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -78,7 +78,7 @@ import org.eclipse.compare.*;
  * @see ITypedElement

  */

 public class EditionSelectionDialog extends Dialog {

-	

+		

 	/**

 	 * An item in an underlying edition.

 	 */

@@ -156,6 +156,8 @@ public class EditionSelectionDialog extends Dialog {
 	private boolean fAddMode= false;

 	/** compare mode if true, otherwise replace/add mode */

 	private boolean fCompareMode= false;

+	/** perform structure compare on editions */

+	private boolean fStructureCompare= false;

 	

 	/**

 	 * Maps from members to their corresponding editions.

@@ -169,6 +171,8 @@ public class EditionSelectionDialog extends Dialog {
 	private Pair fTargetPair;

 	/** The selected edition in the edition viewer */

 	private ITypedElement fSelectedItem;

+	private String fTitleArg;

+	private Image fTitleImage;

 	

 	// SWT controls

 	private CompareViewerSwitchingPane fContentPane;

@@ -178,7 +182,8 @@ public class EditionSelectionDialog extends Dialog {
 	private Tree fEditionTree;

 	private CompareViewerPane fEditionPane;

 	private Image fDateImage;

-	private Image fTimeImage;	

+	private Image fTimeImage;

+	private CompareViewerSwitchingPane fStructuredComparePane;

 	

 	/**

 	 * Creates a new modal, resizable dialog.

@@ -222,6 +227,14 @@ public class EditionSelectionDialog extends Dialog {
 		if (id != null)

 			fTimeImage= id.createImage();

 	}

+		

+	public void setEditionTitleArgument(String titleArgument) {

+		fTitleArg= titleArgument;

+	}

+	

+	public void setEditionTitleImage(Image titleImage) {

+		fTitleImage= titleImage;

+	}

 	

 	/**

 	 * Select the previous edition.

@@ -480,6 +493,7 @@ public class EditionSelectionDialog extends Dialog {
 	 */

 	public void setCompareMode(boolean compareMode) {

 		fCompareMode= compareMode;

+		fStructureCompare= fCompareMode && !fAddMode;

 	}

 	

 	/**

@@ -656,12 +670,29 @@ public class EditionSelectionDialog extends Dialog {
 			

 			fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);

 		} else {

-			// only a single pane showing the editions

-			fEditionPane= new CompareViewerPane(vsplitter, SWT.BORDER | SWT.FLAT);

-			

+			if (fStructureCompare) {

+				// we need two panes: the left for the elements, the right one for the structured diff

+				Splitter hsplitter= new Splitter(vsplitter,  SWT.HORIZONTAL);

+				

+				fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);

+				fStructuredComparePane= new CompareViewerSwitchingPane(hsplitter, SWT.BORDER | SWT.FLAT, true) {

+					protected Viewer getViewer(Viewer oldViewer, Object input) {

+						if (input instanceof ICompareInput)

+							return CompareUIPlugin.findStructureViewer(oldViewer, (ICompareInput)input, this, fCompareConfiguration);

+						return null;

+					}

+				};

+			} else {

+				// only a single pane showing the editions

+				fEditionPane= new CompareViewerPane(vsplitter, SWT.BORDER | SWT.FLAT);

+			}

+			if (fTitleArg == null)

+				fTitleArg= fTargetPair.getItem().getName();

 			String titleFormat= Utilities.getString(fBundle, "treeTitleFormat"); //$NON-NLS-1$

-			String title= MessageFormat.format(titleFormat, new Object[] { fTargetPair.getItem().getName() });

+			String title= MessageFormat.format(titleFormat, new String[] { fTitleArg });

 			fEditionPane.setText(title);

+			if (fTitleImage != null)

+				fEditionPane.setImage(fTitleImage);

 		}

 		

 		fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL + SWT.V_SCROLL);

@@ -947,10 +978,12 @@ public class EditionSelectionDialog extends Dialog {
 				input= ci.getRight();

 		}

 		fContentPane.setInput(input);

+		if (fStructuredComparePane != null)

+			fStructuredComparePane.setInput(input);

 	}

 	

 	/*

-	 * Feeds selection from edition viewer to content viewer.

+	 * Feeds selection from edition viewer to content (and structure) viewer.

 	 */

 	private void feedInput(Widget w) {

 		Object input= w.getData();

@@ -987,4 +1020,3 @@ public class EditionSelectionDialog extends Dialog {
 			fCommitButton.setEnabled(isOK && fSelectedItem != null && fTargetPair.getItem() != fSelectedItem);

 	}

 }

-

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
index 2ef0a1605..83b21aa59 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
@@ -20,7 +20,8 @@ parseErrorFormat= {0} (Parse Error)
 editionLabel= Local History ({0})

 workspaceEditionLabel= Workspace File

 

-targetLabel= {0}

+targetLabel= Editor Buffer

+workspaceTargetLabel= Workspace File

 

 todayFormat= Today ({0})

 yesterdayFormat= Yesterday ({0})

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
index 5b7546494..f7f87fa32 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
@@ -43,17 +43,19 @@ public class EditionAction implements IActionDelegate {
 		

 		private IDocument fDocument;

 		private String type;

+		private IFile fFile;

 		

-		DocumentBufferNode(IDocument document, String type) {

+		DocumentBufferNode(IDocument document, IFile file) {

 			fDocument= document;

+			fFile= file;

 		}

 		

 		public String getName() {

-			return "Editor Buffer";

+			return fFile.getName();

 		}

 		

 		public String getType() {

-			return type;

+			return fFile.getFileExtension();

 		}

 		

 		public Image getImage() {

@@ -126,7 +128,7 @@ public class EditionAction implements IActionDelegate {
 		IDocument document= getDocument(file);

 		ITypedElement target= base;

 		if (document != null)

-			target= new DocumentBufferNode(document, file.getFileExtension());

+			target= new DocumentBufferNode(document, file);

 	

 		ITypedElement[] editions= new ITypedElement[states.length+1];

 		editions[0]= base;

@@ -134,6 +136,8 @@ public class EditionAction implements IActionDelegate {
 			editions[i+1]= new HistoryItem(base, states[i]);

 

 		EditionSelectionDialog d= new EditionSelectionDialog(parentShell, bundle);

+		d.setEditionTitleArgument(file.getName());

+		d.setEditionTitleImage(CompareUIPlugin.getImage(file));

 		//d.setHideIdenticalEntries(false);

 		

 		if (fReplaceMode) {

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
index 71489efa6..fa54ff207 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
@@ -10,6 +10,7 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.Control;

 

 import org.eclipse.jface.util.*;

+import org.eclipse.jface.action.*;

 import org.eclipse.jface.action.ToolBarManager;

 import org.eclipse.jface.text.*;

 

@@ -49,7 +50,8 @@ public class StructureDiffViewer extends DiffTreeViewer {
 	

 	private IStructureCreator fStructureCreator;

 	private IDiffContainer fRoot;

-	private ChangePropertyAction fSmartAction;

+	//private ChangePropertyAction fSmartAction;

+	private ActionContributionItem fSmartActionItem;

 	private IContentChangeListener fContentChangedListener;

 	private ICompareInputChangeListener fThreeWayInputChangedListener;

 	private CompareViewerSwitchingPane fParent;

@@ -115,9 +117,10 @@ public class StructureDiffViewer extends DiffTreeViewer {
 			if (tree != null && !tree.isDisposed())

 				tree.setData(CompareUI.COMPARE_VIEWER_TITLE, getTitle());

 			

-			if (fStructureCreator != null) {

-				if (fSmartAction != null)

-					fSmartAction.setEnabled(fStructureCreator.canRewriteTree());

+			if (fStructureCreator != null && fSmartActionItem != null) {

+				IAction a= fSmartActionItem.getAction();

+				if (a != null)

+					a.setEnabled(fStructureCreator.canRewriteTree());

 				// FIXME: if there is an input we should create the trees!

 			}

 		}

@@ -187,7 +190,10 @@ public class StructureDiffViewer extends DiffTreeViewer {
 		

 		if (input != null)

 			t= input.getAncestor();

-		fThreeWay= t != null;

+			

+		fThreeWay= (t != null);

+		fSmartActionItem.setVisible(fThreeWay);

+

 		if (t != fAncestorInput) {

 			if (fAncestorInput instanceof IContentChangeNotifier)

 				((IContentChangeNotifier)fAncestorInput).removeContentChangeListener(fContentChangedListener);

@@ -354,8 +360,10 @@ public class StructureDiffViewer extends DiffTreeViewer {
 		

 		super.createToolItems(toolBarManager);

 		

-		fSmartAction= new ChangePropertyAction(getBundle(), getCompareConfiguration(), "action.Smart.", SMART); //$NON-NLS-1$

-		toolBarManager.appendToGroup("modes", fSmartAction); //$NON-NLS-1$

+		IAction a= new ChangePropertyAction(getBundle(), getCompareConfiguration(), "action.Smart.", SMART); //$NON-NLS-1$

+		fSmartActionItem= new ActionContributionItem(a);

+		fSmartActionItem.setVisible(fThreeWay);

+		toolBarManager.appendToGroup("modes", fSmartActionItem); //$NON-NLS-1$

 	}

 	

 	/**

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index f7bbc1198..144f011ab 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -11,7 +11,7 @@
 <h1>

 Eclipse Platform Build Notes<br>

 Compare</h1>

-Eclipse Build Input January ??th 2002

+Eclipse Build Input January 29th 2002

 

 <h2>

 What's new in this drop</h2>

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
index 5b294c778..6eeda5d56 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -78,7 +78,7 @@ import org.eclipse.compare.*;
  * @see ITypedElement

  */

 public class EditionSelectionDialog extends Dialog {

-	

+		

 	/**

 	 * An item in an underlying edition.

 	 */

@@ -156,6 +156,8 @@ public class EditionSelectionDialog extends Dialog {
 	private boolean fAddMode= false;

 	/** compare mode if true, otherwise replace/add mode */

 	private boolean fCompareMode= false;

+	/** perform structure compare on editions */

+	private boolean fStructureCompare= false;

 	

 	/**

 	 * Maps from members to their corresponding editions.

@@ -169,6 +171,8 @@ public class EditionSelectionDialog extends Dialog {
 	private Pair fTargetPair;

 	/** The selected edition in the edition viewer */

 	private ITypedElement fSelectedItem;

+	private String fTitleArg;

+	private Image fTitleImage;

 	

 	// SWT controls

 	private CompareViewerSwitchingPane fContentPane;

@@ -178,7 +182,8 @@ public class EditionSelectionDialog extends Dialog {
 	private Tree fEditionTree;

 	private CompareViewerPane fEditionPane;

 	private Image fDateImage;

-	private Image fTimeImage;	

+	private Image fTimeImage;

+	private CompareViewerSwitchingPane fStructuredComparePane;

 	

 	/**

 	 * Creates a new modal, resizable dialog.

@@ -222,6 +227,14 @@ public class EditionSelectionDialog extends Dialog {
 		if (id != null)

 			fTimeImage= id.createImage();

 	}

+		

+	public void setEditionTitleArgument(String titleArgument) {

+		fTitleArg= titleArgument;

+	}

+	

+	public void setEditionTitleImage(Image titleImage) {

+		fTitleImage= titleImage;

+	}

 	

 	/**

 	 * Select the previous edition.

@@ -480,6 +493,7 @@ public class EditionSelectionDialog extends Dialog {
 	 */

 	public void setCompareMode(boolean compareMode) {

 		fCompareMode= compareMode;

+		fStructureCompare= fCompareMode && !fAddMode;

 	}

 	

 	/**

@@ -656,12 +670,29 @@ public class EditionSelectionDialog extends Dialog {
 			

 			fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);

 		} else {

-			// only a single pane showing the editions

-			fEditionPane= new CompareViewerPane(vsplitter, SWT.BORDER | SWT.FLAT);

-			

+			if (fStructureCompare) {

+				// we need two panes: the left for the elements, the right one for the structured diff

+				Splitter hsplitter= new Splitter(vsplitter,  SWT.HORIZONTAL);

+				

+				fEditionPane= new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);

+				fStructuredComparePane= new CompareViewerSwitchingPane(hsplitter, SWT.BORDER | SWT.FLAT, true) {

+					protected Viewer getViewer(Viewer oldViewer, Object input) {

+						if (input instanceof ICompareInput)

+							return CompareUIPlugin.findStructureViewer(oldViewer, (ICompareInput)input, this, fCompareConfiguration);

+						return null;

+					}

+				};

+			} else {

+				// only a single pane showing the editions

+				fEditionPane= new CompareViewerPane(vsplitter, SWT.BORDER | SWT.FLAT);

+			}

+			if (fTitleArg == null)

+				fTitleArg= fTargetPair.getItem().getName();

 			String titleFormat= Utilities.getString(fBundle, "treeTitleFormat"); //$NON-NLS-1$

-			String title= MessageFormat.format(titleFormat, new Object[] { fTargetPair.getItem().getName() });

+			String title= MessageFormat.format(titleFormat, new String[] { fTitleArg });

 			fEditionPane.setText(title);

+			if (fTitleImage != null)

+				fEditionPane.setImage(fTitleImage);

 		}

 		

 		fEditionTree= new Tree(fEditionPane, SWT.H_SCROLL + SWT.V_SCROLL);

@@ -947,10 +978,12 @@ public class EditionSelectionDialog extends Dialog {
 				input= ci.getRight();

 		}

 		fContentPane.setInput(input);

+		if (fStructuredComparePane != null)

+			fStructuredComparePane.setInput(input);

 	}

 	

 	/*

-	 * Feeds selection from edition viewer to content viewer.

+	 * Feeds selection from edition viewer to content (and structure) viewer.

 	 */

 	private void feedInput(Widget w) {

 		Object input= w.getData();

@@ -987,4 +1020,3 @@ public class EditionSelectionDialog extends Dialog {
 			fCommitButton.setEnabled(isOK && fSelectedItem != null && fTargetPair.getItem() != fSelectedItem);

 	}

 }

-

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
index 2ef0a1605..83b21aa59 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareWithEditionAction.properties
@@ -20,7 +20,8 @@ parseErrorFormat= {0} (Parse Error)
 editionLabel= Local History ({0})

 workspaceEditionLabel= Workspace File

 

-targetLabel= {0}

+targetLabel= Editor Buffer

+workspaceTargetLabel= Workspace File

 

 todayFormat= Today ({0})

 yesterdayFormat= Yesterday ({0})

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
index 5b7546494..f7f87fa32 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/EditionAction.java
@@ -43,17 +43,19 @@ public class EditionAction implements IActionDelegate {
 		

 		private IDocument fDocument;

 		private String type;

+		private IFile fFile;

 		

-		DocumentBufferNode(IDocument document, String type) {

+		DocumentBufferNode(IDocument document, IFile file) {

 			fDocument= document;

+			fFile= file;

 		}

 		

 		public String getName() {

-			return "Editor Buffer";

+			return fFile.getName();

 		}

 		

 		public String getType() {

-			return type;

+			return fFile.getFileExtension();

 		}

 		

 		public Image getImage() {

@@ -126,7 +128,7 @@ public class EditionAction implements IActionDelegate {
 		IDocument document= getDocument(file);

 		ITypedElement target= base;

 		if (document != null)

-			target= new DocumentBufferNode(document, file.getFileExtension());

+			target= new DocumentBufferNode(document, file);

 	

 		ITypedElement[] editions= new ITypedElement[states.length+1];

 		editions[0]= base;

@@ -134,6 +136,8 @@ public class EditionAction implements IActionDelegate {
 			editions[i+1]= new HistoryItem(base, states[i]);

 

 		EditionSelectionDialog d= new EditionSelectionDialog(parentShell, bundle);

+		d.setEditionTitleArgument(file.getName());

+		d.setEditionTitleImage(CompareUIPlugin.getImage(file));

 		//d.setHideIdenticalEntries(false);

 		

 		if (fReplaceMode) {

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
index 71489efa6..fa54ff207 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
@@ -10,6 +10,7 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.Control;

 

 import org.eclipse.jface.util.*;

+import org.eclipse.jface.action.*;

 import org.eclipse.jface.action.ToolBarManager;

 import org.eclipse.jface.text.*;

 

@@ -49,7 +50,8 @@ public class StructureDiffViewer extends DiffTreeViewer {
 	

 	private IStructureCreator fStructureCreator;

 	private IDiffContainer fRoot;

-	private ChangePropertyAction fSmartAction;

+	//private ChangePropertyAction fSmartAction;

+	private ActionContributionItem fSmartActionItem;

 	private IContentChangeListener fContentChangedListener;

 	private ICompareInputChangeListener fThreeWayInputChangedListener;

 	private CompareViewerSwitchingPane fParent;

@@ -115,9 +117,10 @@ public class StructureDiffViewer extends DiffTreeViewer {
 			if (tree != null && !tree.isDisposed())

 				tree.setData(CompareUI.COMPARE_VIEWER_TITLE, getTitle());

 			

-			if (fStructureCreator != null) {

-				if (fSmartAction != null)

-					fSmartAction.setEnabled(fStructureCreator.canRewriteTree());

+			if (fStructureCreator != null && fSmartActionItem != null) {

+				IAction a= fSmartActionItem.getAction();

+				if (a != null)

+					a.setEnabled(fStructureCreator.canRewriteTree());

 				// FIXME: if there is an input we should create the trees!

 			}

 		}

@@ -187,7 +190,10 @@ public class StructureDiffViewer extends DiffTreeViewer {
 		

 		if (input != null)

 			t= input.getAncestor();

-		fThreeWay= t != null;

+			

+		fThreeWay= (t != null);

+		fSmartActionItem.setVisible(fThreeWay);

+

 		if (t != fAncestorInput) {

 			if (fAncestorInput instanceof IContentChangeNotifier)

 				((IContentChangeNotifier)fAncestorInput).removeContentChangeListener(fContentChangedListener);

@@ -354,8 +360,10 @@ public class StructureDiffViewer extends DiffTreeViewer {
 		

 		super.createToolItems(toolBarManager);

 		

-		fSmartAction= new ChangePropertyAction(getBundle(), getCompareConfiguration(), "action.Smart.", SMART); //$NON-NLS-1$

-		toolBarManager.appendToGroup("modes", fSmartAction); //$NON-NLS-1$

+		IAction a= new ChangePropertyAction(getBundle(), getCompareConfiguration(), "action.Smart.", SMART); //$NON-NLS-1$

+		fSmartActionItem= new ActionContributionItem(a);

+		fSmartActionItem.setVisible(fThreeWay);

+		toolBarManager.appendToGroup("modes", fSmartActionItem); //$NON-NLS-1$

 	}

 	

 	/**