Updated example

3 files changed, 5 insertions, 5 deletions

diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergeDialog.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergeDialog.java
index 69d84c433..9a4792ee5 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergeDialog.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergeDialog.java
@@ -28,7 +28,7 @@ import org.eclipse.team.ui.SaveablePartDialog;
 public class NonSyncMergeDialog extends SaveablePartDialog {
 
 	public static void openFor(NonSyncModelMergeOperation operation) {
-		NoSyncModelMergePage page = new NoSyncModelMergePage((IMergeContext) operation.getContext());
+		NonSyncModelMergePage page = new NonSyncModelMergePage((IMergeContext) operation.getContext());
 		NonSyncMergePart part = new NonSyncMergePart(operation.getShell(), new CompareConfiguration(), page);
 		NonSyncMergeDialog dialog = new NonSyncMergeDialog(operation.getShell(), part);
 		dialog.open();
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java
index b24ea3e75..aa6fa1e80 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java
@@ -37,9 +37,9 @@ import org.eclipse.team.ui.mapping.ISynchronizationCompareInput;
  */
 public class NonSyncMergePart extends PageSaveablePart {
 	
-	private final NoSyncModelMergePage page;
+	private final NonSyncModelMergePage page;
 
-	protected NonSyncMergePart(Shell shell, CompareConfiguration compareConfiguration, NoSyncModelMergePage page) {
+	protected NonSyncMergePart(Shell shell, CompareConfiguration compareConfiguration, NonSyncModelMergePage page) {
 		super(shell, compareConfiguration);
 		this.page = page;
 	}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NoSyncModelMergePage.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergePage.java
index 0dd22bfba..99e7fce90 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NoSyncModelMergePage.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergePage.java
@@ -36,7 +36,7 @@ import org.eclipse.ui.part.Page;
 /**
  * This class provides the page for the {@link NonSyncMergePart}.
  */
-public class NoSyncModelMergePage extends Page {
+public class NonSyncModelMergePage extends Page {
 	
 	IMergeContext context;
 	private TreeViewer viewer;
@@ -138,7 +138,7 @@ public class NoSyncModelMergePage extends Page {
 		}
 	}
 	
-	public NoSyncModelMergePage(IMergeContext context) {
+	public NonSyncModelMergePage(IMergeContext context) {
 		super();
 		this.context = context;
 	}