corrected typos in Java docv20050621R3_1

26 files changed, 80 insertions, 80 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
index 35689f970..28f1d8c75 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -133,7 +133,7 @@ public class CompareConfiguration {
 	/**
 	 * Creates a new configuration with editable left and right sides,
 	 * suitable default labels, and no images.
-	 * This configuration uses the preference store of the Compare plugin
+	 * This configuration uses the preference store of the Compare plug-in
 	 * (<code>CompareUIPlugin.getDefault().getPreferenceStore()</code>).
 	 */
 	public CompareConfiguration() {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index 0cb2cfc38..5d76cc7f5 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,7 +40,7 @@ import org.eclipse.compare.structuremergeviewer.*;
 
 /**
  * A compare operation which can present its results in a special editor.
- * Running the compare operation and presentating the results in a compare editor
+ * Running the compare operation and presenting the results in a compare editor
  * are combined in one class because it allows a client to keep the implementation
  * all in one place while separating it from the innards of a specific UI implementation of compare/merge.
  * <p> 
@@ -713,7 +713,7 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 	 
 	 * Returns <code>true</code> if this input has unsaved changes,
 	 * that is if <code>setDirty(true)</code> has been called.
-	 * Subclasses don't have to override if the functionality provided by <doce>setDirty</code>
+	 * Subclasses don't have to override if the functionality provided by <code>setDirty</code>
 	 * is sufficient.
 	 *
 	 * @return <code>true</code> if there are changes that need to be saved
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
index 66ace74bf..58b69d24f 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -323,7 +323,7 @@ public final class CompareUI {
 	 * given type this method does nothing.
 	 * <p>
 	 * Note: this method is for internal use only. Clients should not call this method. 
-	 * @param type the type name for which all synonymes are removed.
+	 * @param type the type name for which all synonyms are removed.
 	 * @since 2.0
 	 */
 	public static void removeAllStructureViewerAliases(String type) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
index 8b35834c8..243cf8b33 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -171,7 +171,7 @@ public abstract class CompareViewerSwitchingPane extends CompareViewerPane
 				sv.addOpenListener(fOpenHandler);
 			}
 			
-			if (oldEmpty != newEmpty) {	// relayout my container
+			if (oldEmpty != newEmpty) {	// re-layout my container
 				Composite parent= getParent();
 				if (parent instanceof Splitter)
 					((Splitter)parent).setVisible(this, fControlVisibility ? !newEmpty : true);
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 dae206f78..544907f84 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -199,8 +199,8 @@ public class EditionSelectionDialog extends ResizableDialog {
 	 *	width       Integer       initial width of dialog
 	 *	height      Integer       initial height of dialog
 	 *	treeTitleFormat   MessageFormat pane title for edition tree; arg 0 is the target
-	 *	dateIcon    String        icon for node in edition tree; path relative to plugin
-	 *	timeIcon    String        icon for leaf in edition tree; path relative to plugin
+	 *	dateIcon    String        icon for node in edition tree; path relative to plug-in
+	 *	timeIcon    String        icon for leaf in edition tree; path relative to plug-in
 	 *	todayFormat MessageFormat format string if date is todays date; arg 0 is date
 	 *	yesterdayFormat MessageFormat format string if date is yesterdays date; arg 0 is date
 	 *	dayFormat   MessageFormat format string if date is any other date; arg 0 is date
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java
index bec3d8f4e..d8a88a75a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -62,7 +62,7 @@ public interface IEditableContent {
 	 *  <TD>src != null</TD>
 	 * </TR>
 	 * </TABLE>
-	 * @param dest the existing child of this object to be replaced; if <code>null</null> a new child can be added.
+	 * @param dest the existing child of this object to be replaced; if <code>null</code> a new child can be added.
 	 * @param src the new child to be added or replaced; if <code>null</code> an existing child can be removed.
 	 * @return the argument <code>dest</code>
 	 */
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
index 866ca254b..41c22c6d1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -184,7 +184,7 @@ public class ZipFileStructureCreator implements IStructureCreator {
 	/**
 	 * Create a new ZipFileStructureCreator with the given title.
 	 * The title is returned by the method <code>getName()</code>.
-	 * @param title the title of this strcuture creator
+	 * @param title the title of this structure creator
 	 */
 	public ZipFileStructureCreator(String title) {
 		fTitle= title;
@@ -297,7 +297,7 @@ public class ZipFileStructureCreator implements IStructureCreator {
 	/**
 	 * Returns <code>false</code> since this <code>IStructureCreator</code>
 	 * cannot rewrite the diff tree in order to fold certain combinations of
-	 * additons and deletions.
+	 * additions and deletions.
 	 * <p>
 	 * Note: this method is for internal use only. Clients should not call this method. 
 	 * @return <code>false</code>
@@ -309,7 +309,7 @@ public class ZipFileStructureCreator implements IStructureCreator {
 	/**
 	 * Empty implementation since this <code>IStructureCreator</code>
 	 * cannot rewrite the diff tree in order to fold certain combinations of
-	 * additons and deletions.
+	 * additions and deletions.
 	 * <p>
 	 * Note: this method is for internal use only. Clients should not call this method. 
 	 * @param differencer
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index 4e1822ec4..65f96ee79 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -433,7 +433,7 @@ public abstract class ContentMergeViewer extends ContentViewer
 	 * The <code>ContentMergeViewer</code> implementation of this 
 	 * <code>ContentViewer</code> method
 	 * checks to ensure that the content provider is an <code>IMergeViewerContentProvider</code>.
-	 * @param contentProvider the contentprovider to set. Must implement IMergeViewerContentProvider. 
+	 * @param contentProvider the content provider to set. Must implement IMergeViewerContentProvider. 
 	 */
 	public void setContentProvider(IContentProvider contentProvider) {
 		Assert.isTrue(contentProvider instanceof IMergeViewerContentProvider);
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index fbcf94137..aac0c5ae8 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -1106,7 +1106,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	/**
 	 * A workaround for bug #65205.
 	 * On MacOS X a Display.update() is required to flush pending paint requests after
-	 * programmatical scolling. 
+	 * programmatically scrolling. 
 	 */
 	private void workaround65205() {
 		if (fIsCarbon && fComposite != null && !fComposite.isDisposed())
@@ -1792,7 +1792,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	}
 	
 	/*
-	 * Called whenver one of the documents changes.
+	 * Called whenever one of the documents changes.
 	 * Sets the dirty state of this viewer and updates the lines.
 	 * Implements IDocumentListener.
 	 */
@@ -1810,8 +1810,8 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	}
 		
 	/*
-	 * This method is called if a range of text on one side is copied into an empty subdocument
-	 * on the other side. The method returns the position where the subdocument is placed into the base document.
+	 * This method is called if a range of text on one side is copied into an empty sub-document
+	 * on the other side. The method returns the position where the sub-document is placed into the base document.
 	 * This default implementation determines the position by using the text range differencer.
 	 * However this position is not always optimal for specific types of text.
 	 * So subclasses (which are aware of the type of text they are dealing with) 
@@ -2060,7 +2060,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 		}
 		if (oldDoc != null) {
 			tp.rememberDocument(null);
-			// deinstall old positions
+			// de-install old positions
 			if (fPositionUpdater != null)
 				oldDoc.removePositionUpdater(fPositionUpdater);
 			try {
@@ -2330,7 +2330,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 					System.gc();
 					throw new InvocationTargetException(ex);
 				}
-				if (monitor.isCanceled())	{ // cancelled
+				if (monitor.isCanceled())	{ // canceled
 					throw new InterruptedException();
 				}
 				monitor.done();
@@ -2476,7 +2476,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 					System.gc();
 					throw new InvocationTargetException(ex);
 				}
-				if (monitor.isCanceled())	{ // cancelled
+				if (monitor.isCanceled())	{ // canceled
 					throw new InterruptedException();
 				}
 				monitor.done();
@@ -3270,7 +3270,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 		CompareConfiguration cc= getCompareConfiguration();
 		if (cc == null)
 			return false;
-		// we only enable the new resolve ui if exactly one side is editable
+		// we only enable the new resolve UI if exactly one side is editable
 		boolean l= cc.isLeftEditable();
 		boolean r= cc.isRightEditable();
 		//return (l && !r) || (r && !l);
@@ -4022,7 +4022,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	/*
 	 * Copy the contents of the given diff from one side to the other but
 	 * doesn't reveal anything.
-	 * Returns true if copy was succesful.
+	 * Returns true if copy was successful.
 	 */
 	private boolean copy(Diff diff, boolean leftToRight) {
 		
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
index 9b2c3f930..03b9eb3aa 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -42,7 +42,7 @@ public final class RangeDifferencer {
 	private static final RangeDifference[] EMPTY_RESULT= new RangeDifference[0];
 	
 	/* (non Javadoc)
-	 * Non instantiatiable!
+	 * Cannot be instantiated!
 	 */
 	private RangeDifferencer() {
 		// nothing to do
@@ -501,7 +501,7 @@ public final class RangeDifferencer {
 	}
 
 	/*
-	 * Tests whether <code>right</code> and <code>left</left> changed in the same way
+	 * Tests whether <code>right</code> and <code>left</code> changed in the same way
 	 */
 	private static boolean rangeSpansEqual(IRangeComparator right, int rightStart, int rightLen, IRangeComparator left, int leftStart, int leftLen) {
 		if (rightLen == leftLen) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java
index 7a030abb1..e665ea734 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -129,7 +129,7 @@ public class DiffNode extends DiffContainer implements ITypedElement, ICompareIn
 	}
 	
 	/**
-	 * Sends out notification that a change has occured on the <code>ICompareInput</code>.
+	 * Sends out notification that a change has occurred on the <code>ICompareInput</code>.
 	 */
 	protected void fireChange() {
 		if (fListener != null) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java
index 5685e718f..3c7652af9 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -475,7 +475,7 @@ public class Differencer {
 	/*
 	 * Tries to return an InputStream for the given object.
 	 * Returns <code>null</code> if the object not an IStreamContentAccessor
-	 * or an error occured.
+	 * or an error occurred.
 	 */
 	private InputStream getStream(Object o) {
 		if (o instanceof IStreamContentAccessor) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
index e022d374f..31a234e27 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -163,7 +163,7 @@ public class DocumentRangeNode
 	 * text without breaking the syntax of the document.
 	 * <p>
 	 * E.g. when parsing a Java document the "append position" of a <code>DocumentRangeNode</code>
-	 * representating a Java class could be the character position just before the closing bracket.
+	 * representing a Java class could be the character position just before the closing bracket.
 	 * Inserting the text of a new method there would not disturb the syntax of the class.
 	 *
 	 * @param pos the character position within the underlying document where text can be legally inserted
@@ -226,7 +226,7 @@ public class DocumentRangeNode
 
 	/**
 	 * Implementation based on <code>getID</code>.
-	 * @return a hashcode for this object.
+	 * @return a hash code for this object.
 	 */
 	public int hashCode() {
 		return fID.hashCode();
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
index 35689f970..28f1d8c75 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareConfiguration.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -133,7 +133,7 @@ public class CompareConfiguration {
 	/**
 	 * Creates a new configuration with editable left and right sides,
 	 * suitable default labels, and no images.
-	 * This configuration uses the preference store of the Compare plugin
+	 * This configuration uses the preference store of the Compare plug-in
 	 * (<code>CompareUIPlugin.getDefault().getPreferenceStore()</code>).
 	 */
 	public CompareConfiguration() {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index 0cb2cfc38..5d76cc7f5 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,7 +40,7 @@ import org.eclipse.compare.structuremergeviewer.*;
 
 /**
  * A compare operation which can present its results in a special editor.
- * Running the compare operation and presentating the results in a compare editor
+ * Running the compare operation and presenting the results in a compare editor
  * are combined in one class because it allows a client to keep the implementation
  * all in one place while separating it from the innards of a specific UI implementation of compare/merge.
  * <p> 
@@ -713,7 +713,7 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 	 
 	 * Returns <code>true</code> if this input has unsaved changes,
 	 * that is if <code>setDirty(true)</code> has been called.
-	 * Subclasses don't have to override if the functionality provided by <doce>setDirty</code>
+	 * Subclasses don't have to override if the functionality provided by <code>setDirty</code>
 	 * is sufficient.
 	 *
 	 * @return <code>true</code> if there are changes that need to be saved
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
index 66ace74bf..58b69d24f 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -323,7 +323,7 @@ public final class CompareUI {
 	 * given type this method does nothing.
 	 * <p>
 	 * Note: this method is for internal use only. Clients should not call this method. 
-	 * @param type the type name for which all synonymes are removed.
+	 * @param type the type name for which all synonyms are removed.
 	 * @since 2.0
 	 */
 	public static void removeAllStructureViewerAliases(String type) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
index 8b35834c8..243cf8b33 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -171,7 +171,7 @@ public abstract class CompareViewerSwitchingPane extends CompareViewerPane
 				sv.addOpenListener(fOpenHandler);
 			}
 			
-			if (oldEmpty != newEmpty) {	// relayout my container
+			if (oldEmpty != newEmpty) {	// re-layout my container
 				Composite parent= getParent();
 				if (parent instanceof Splitter)
 					((Splitter)parent).setVisible(this, fControlVisibility ? !newEmpty : true);
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 dae206f78..544907f84 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -199,8 +199,8 @@ public class EditionSelectionDialog extends ResizableDialog {
 	 *	width       Integer       initial width of dialog
 	 *	height      Integer       initial height of dialog
 	 *	treeTitleFormat   MessageFormat pane title for edition tree; arg 0 is the target
-	 *	dateIcon    String        icon for node in edition tree; path relative to plugin
-	 *	timeIcon    String        icon for leaf in edition tree; path relative to plugin
+	 *	dateIcon    String        icon for node in edition tree; path relative to plug-in
+	 *	timeIcon    String        icon for leaf in edition tree; path relative to plug-in
 	 *	todayFormat MessageFormat format string if date is todays date; arg 0 is date
 	 *	yesterdayFormat MessageFormat format string if date is yesterdays date; arg 0 is date
 	 *	dayFormat   MessageFormat format string if date is any other date; arg 0 is date
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java
index bec3d8f4e..d8a88a75a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IEditableContent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -62,7 +62,7 @@ public interface IEditableContent {
 	 *  <TD>src != null</TD>
 	 * </TR>
 	 * </TABLE>
-	 * @param dest the existing child of this object to be replaced; if <code>null</null> a new child can be added.
+	 * @param dest the existing child of this object to be replaced; if <code>null</code> a new child can be added.
 	 * @param src the new child to be added or replaced; if <code>null</code> an existing child can be removed.
 	 * @return the argument <code>dest</code>
 	 */
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
index 866ca254b..41c22c6d1 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -184,7 +184,7 @@ public class ZipFileStructureCreator implements IStructureCreator {
 	/**
 	 * Create a new ZipFileStructureCreator with the given title.
 	 * The title is returned by the method <code>getName()</code>.
-	 * @param title the title of this strcuture creator
+	 * @param title the title of this structure creator
 	 */
 	public ZipFileStructureCreator(String title) {
 		fTitle= title;
@@ -297,7 +297,7 @@ public class ZipFileStructureCreator implements IStructureCreator {
 	/**
 	 * Returns <code>false</code> since this <code>IStructureCreator</code>
 	 * cannot rewrite the diff tree in order to fold certain combinations of
-	 * additons and deletions.
+	 * additions and deletions.
 	 * <p>
 	 * Note: this method is for internal use only. Clients should not call this method. 
 	 * @return <code>false</code>
@@ -309,7 +309,7 @@ public class ZipFileStructureCreator implements IStructureCreator {
 	/**
 	 * Empty implementation since this <code>IStructureCreator</code>
 	 * cannot rewrite the diff tree in order to fold certain combinations of
-	 * additons and deletions.
+	 * additions and deletions.
 	 * <p>
 	 * Note: this method is for internal use only. Clients should not call this method. 
 	 * @param differencer
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index 4e1822ec4..65f96ee79 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -433,7 +433,7 @@ public abstract class ContentMergeViewer extends ContentViewer
 	 * The <code>ContentMergeViewer</code> implementation of this 
 	 * <code>ContentViewer</code> method
 	 * checks to ensure that the content provider is an <code>IMergeViewerContentProvider</code>.
-	 * @param contentProvider the contentprovider to set. Must implement IMergeViewerContentProvider. 
+	 * @param contentProvider the content provider to set. Must implement IMergeViewerContentProvider. 
 	 */
 	public void setContentProvider(IContentProvider contentProvider) {
 		Assert.isTrue(contentProvider instanceof IMergeViewerContentProvider);
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index fbcf94137..aac0c5ae8 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -1106,7 +1106,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	/**
 	 * A workaround for bug #65205.
 	 * On MacOS X a Display.update() is required to flush pending paint requests after
-	 * programmatical scolling. 
+	 * programmatically scrolling. 
 	 */
 	private void workaround65205() {
 		if (fIsCarbon && fComposite != null && !fComposite.isDisposed())
@@ -1792,7 +1792,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	}
 	
 	/*
-	 * Called whenver one of the documents changes.
+	 * Called whenever one of the documents changes.
 	 * Sets the dirty state of this viewer and updates the lines.
 	 * Implements IDocumentListener.
 	 */
@@ -1810,8 +1810,8 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	}
 		
 	/*
-	 * This method is called if a range of text on one side is copied into an empty subdocument
-	 * on the other side. The method returns the position where the subdocument is placed into the base document.
+	 * This method is called if a range of text on one side is copied into an empty sub-document
+	 * on the other side. The method returns the position where the sub-document is placed into the base document.
 	 * This default implementation determines the position by using the text range differencer.
 	 * However this position is not always optimal for specific types of text.
 	 * So subclasses (which are aware of the type of text they are dealing with) 
@@ -2060,7 +2060,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 		}
 		if (oldDoc != null) {
 			tp.rememberDocument(null);
-			// deinstall old positions
+			// de-install old positions
 			if (fPositionUpdater != null)
 				oldDoc.removePositionUpdater(fPositionUpdater);
 			try {
@@ -2330,7 +2330,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 					System.gc();
 					throw new InvocationTargetException(ex);
 				}
-				if (monitor.isCanceled())	{ // cancelled
+				if (monitor.isCanceled())	{ // canceled
 					throw new InterruptedException();
 				}
 				monitor.done();
@@ -2476,7 +2476,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 					System.gc();
 					throw new InvocationTargetException(ex);
 				}
-				if (monitor.isCanceled())	{ // cancelled
+				if (monitor.isCanceled())	{ // canceled
 					throw new InterruptedException();
 				}
 				monitor.done();
@@ -3270,7 +3270,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 		CompareConfiguration cc= getCompareConfiguration();
 		if (cc == null)
 			return false;
-		// we only enable the new resolve ui if exactly one side is editable
+		// we only enable the new resolve UI if exactly one side is editable
 		boolean l= cc.isLeftEditable();
 		boolean r= cc.isRightEditable();
 		//return (l && !r) || (r && !l);
@@ -4022,7 +4022,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	/*
 	 * Copy the contents of the given diff from one side to the other but
 	 * doesn't reveal anything.
-	 * Returns true if copy was succesful.
+	 * Returns true if copy was successful.
 	 */
 	private boolean copy(Diff diff, boolean leftToRight) {
 		
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
index 9b2c3f930..03b9eb3aa 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -42,7 +42,7 @@ public final class RangeDifferencer {
 	private static final RangeDifference[] EMPTY_RESULT= new RangeDifference[0];
 	
 	/* (non Javadoc)
-	 * Non instantiatiable!
+	 * Cannot be instantiated!
 	 */
 	private RangeDifferencer() {
 		// nothing to do
@@ -501,7 +501,7 @@ public final class RangeDifferencer {
 	}
 
 	/*
-	 * Tests whether <code>right</code> and <code>left</left> changed in the same way
+	 * Tests whether <code>right</code> and <code>left</code> changed in the same way
 	 */
 	private static boolean rangeSpansEqual(IRangeComparator right, int rightStart, int rightLen, IRangeComparator left, int leftStart, int leftLen) {
 		if (rightLen == leftLen) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java
index 7a030abb1..e665ea734 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -129,7 +129,7 @@ public class DiffNode extends DiffContainer implements ITypedElement, ICompareIn
 	}
 	
 	/**
-	 * Sends out notification that a change has occured on the <code>ICompareInput</code>.
+	 * Sends out notification that a change has occurred on the <code>ICompareInput</code>.
 	 */
 	protected void fireChange() {
 		if (fListener != null) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java
index 5685e718f..3c7652af9 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/Differencer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -475,7 +475,7 @@ public class Differencer {
 	/*
 	 * Tries to return an InputStream for the given object.
 	 * Returns <code>null</code> if the object not an IStreamContentAccessor
-	 * or an error occured.
+	 * or an error occurred.
 	 */
 	private InputStream getStream(Object o) {
 		if (o instanceof IStreamContentAccessor) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
index e022d374f..31a234e27 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
+ * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -163,7 +163,7 @@ public class DocumentRangeNode
 	 * text without breaking the syntax of the document.
 	 * <p>
 	 * E.g. when parsing a Java document the "append position" of a <code>DocumentRangeNode</code>
-	 * representating a Java class could be the character position just before the closing bracket.
+	 * representing a Java class could be the character position just before the closing bracket.
 	 * Inserting the text of a new method there would not disturb the syntax of the class.
 	 *
 	 * @param pos the character position within the underlying document where text can be legally inserted
@@ -226,7 +226,7 @@ public class DocumentRangeNode
 
 	/**
 	 * Implementation based on <code>getID</code>.
-	 * @return a hashcode for this object.
+	 * @return a hash code for this object.
 	 */
 	public int hashCode() {
 		return fID.hashCode();