removed unused importsv20021025

62 files changed, 4 insertions, 160 deletions

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 e14fcd302..969297d4f 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -11,17 +11,14 @@ package org.eclipse.compare;
 

 import java.lang.reflect.InvocationTargetException;

 

-import java.util.List;

 import java.util.ArrayList;

 import java.util.ResourceBundle;

 

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.*;

-import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.widgets.*;

 import org.eclipse.swt.graphics.Image;

 

-import org.eclipse.core.resources.IResource;

 import org.eclipse.core.runtime.*;

 import org.eclipse.ui.IPersistableElement;

 import org.eclipse.ui.IEditorInput;

@@ -35,7 +32,6 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.resource.ImageDescriptor;

 

-import org.eclipse.compare.contentmergeviewer.ContentMergeViewer;

 import org.eclipse.compare.internal.*;

 import org.eclipse.compare.structuremergeviewer.*;

 

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 db6faf3ce..5380fa438 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareUI.java
@@ -22,9 +22,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.ui.plugin.AbstractUIPlugin;

 

 import org.eclipse.compare.internal.CompareUIPlugin;

-import org.eclipse.compare.internal.IStructureCreatorDescriptor;

 import org.eclipse.compare.structuremergeviewer.ICompareInput;

-import org.eclipse.compare.structuremergeviewer.IStructureCreator;

 

 

 /**

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 bb55909cb..7c6c1b829 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
@@ -11,7 +11,6 @@ package org.eclipse.compare;
 

 import java.text.MessageFormat;

 

-import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.*;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.*;

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 a43429c29..47f70f848 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java
@@ -23,7 +23,6 @@ import java.text.*;
 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.*;

 import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.widgets.Widget;

 import org.eclipse.swt.widgets.Control;

@@ -42,8 +41,6 @@ import org.eclipse.jface.viewers.*;
 import org.eclipse.jface.util.Assert;

 import org.eclipse.jface.dialogs.*;

 

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFileState;

 import org.eclipse.core.runtime.CoreException;

 

 import org.eclipse.compare.internal.*;

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
index 6c488a159..558c48840 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
@@ -6,7 +6,6 @@ package org.eclipse.compare;
 

 import java.io.*;

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import org.eclipse.swt.graphics.Image;

 

@@ -15,7 +14,6 @@ import org.eclipse.jface.util.Assert;
 import org.eclipse.core.resources.*;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

-import org.eclipse.compare.internal.Utilities;

 import org.eclipse.compare.structuremergeviewer.IStructureComparator;

 

 /**

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 469bca261..9869a9f5c 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/ZipFileStructureCreator.java
@@ -16,7 +16,6 @@ import java.util.zip.*;
 

 import org.eclipse.swt.graphics.Image;

 

-import org.eclipse.jface.text.IDocument;

 import org.eclipse.jface.util.Assert;

 

 import org.eclipse.core.runtime.CoreException;

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 71b2f0a38..81679fcba 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
@@ -31,7 +31,6 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.compare.*;

 import org.eclipse.compare.structuremergeviewer.*;

 import org.eclipse.compare.contentmergeviewer.IMergeViewerContentProvider;

-import org.eclipse.compare.contentmergeviewer.TextMergeViewer;

 import org.eclipse.compare.internal.*;

 

 /**

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 37d5ebfa8..24cc327a6 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
@@ -15,8 +15,6 @@ import java.util.Iterator;
 import java.util.Map;

 import java.util.HashMap;

 import java.util.ResourceBundle;

-import java.io.InputStream;

-import java.io.IOException;

 import java.io.UnsupportedEncodingException;

 import java.text.MessageFormat;

 

@@ -37,10 +35,8 @@ import org.eclipse.swt.custom.*;
 

 import org.eclipse.jface.action.*;

 import org.eclipse.jface.text.*;

-import org.eclipse.jface.text.source.SourceViewer;

 import org.eclipse.jface.util.PropertyChangeEvent;

 import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.jface.dialogs.MessageDialog;

@@ -50,7 +46,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.CoreException;

 

-import org.eclipse.ui.texteditor.IUpdate;

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IWorkbenchActionConstants;

 

@@ -59,12 +54,8 @@ import org.eclipse.compare.internal.MergeSourceViewer;
 import org.eclipse.compare.internal.BufferedCanvas;

 import org.eclipse.compare.internal.Utilities;

 import org.eclipse.compare.internal.TokenComparator;

-import org.eclipse.compare.internal.ChangePropertyAction;

-import org.eclipse.compare.internal.CompareEditor;

 import org.eclipse.compare.internal.DocLineComparator;

 import org.eclipse.compare.internal.ComparePreferencePage;

-import org.eclipse.compare.internal.CompareUIPlugin;

-import org.eclipse.compare.internal.MergeViewerAction;

 import org.eclipse.compare.internal.INavigatable;

 import org.eclipse.compare.internal.CompareNavigator;

 import org.eclipse.compare.internal.TimeoutContext;

@@ -158,7 +149,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	/** Width of birds eye view */

 	private static final int BIRDS_EYE_VIEW_INSET= 1;

 	/** Use splines between diff ranges */

-	private static final boolean USE_SPLINES= false;

+	private static final boolean USE_SPLINES= true;

 

 	/** line width of change borders */

 	private static final int LW= 1;

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
index c1ff3bda9..80c826ba3 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
@@ -5,7 +5,6 @@
 package org.eclipse.compare.internal;

 

 import java.io.*;

-import java.lang.reflect.InvocationTargetException;

 import java.util.ResourceBundle;

 import java.text.MessageFormat;

 

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
index 6ef8059a2..a30087d98 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
@@ -4,9 +4,6 @@
  */

 package org.eclipse.compare.internal;

 

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyAdapter;

-import org.eclipse.swt.events.KeyEvent;

 import org.eclipse.swt.widgets.Control;

 import org.eclipse.swt.widgets.Display;

 

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index e4dd22515..8fff81873 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -13,7 +13,6 @@ import org.eclipse.swt.layout.*;
 import org.eclipse.swt.events.*;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.RGB;

 

 import org.eclipse.jface.preference.*;

 import org.eclipse.jface.util.*;

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index a55ff322c..7d006a37e 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -11,20 +11,17 @@ import java.net.MalformedURLException;
 import java.lang.reflect.InvocationTargetException;

 import java.util.*;

 

-import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Shell;

 

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.util.Assert;

 import org.eclipse.jface.preference.IPreferenceStore;

 

-import org.eclipse.ui.internal.SharedImages;

 import org.eclipse.core.runtime.*;

 import org.eclipse.ui.model.IWorkbenchAdapter;

 import org.eclipse.ui.*;

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java
index 8373bed55..b7acc1de7 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java
@@ -4,7 +4,6 @@
  */

 package org.eclipse.compare.internal;

 

-import java.io.ByteArrayInputStream;

 import java.io.InputStream;

 import java.io.IOException;

 import java.util.ResourceBundle;

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
index 307a1d139..10a4f3378 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
@@ -16,14 +16,9 @@ import org.eclipse.swt.graphics.Font;
 import org.eclipse.jface.action.*;

 import org.eclipse.jface.viewers.*;

 import org.eclipse.jface.text.*;

-import org.eclipse.jface.util.*;

 import org.eclipse.jface.text.source.*;

 

-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.ui.texteditor.IUpdate;

-import org.eclipse.ui.IWorkbenchActionConstants;

-

-import org.eclipse.compare.contentmergeviewer.TextMergeViewer;

-

+import org.eclipse.jface.viewers.SelectionChangedEvent;


 /**

  * Extends the JFace SourceViewer with some convenience methods.

  */

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java
index fd7a885bd..5eb45e72f 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java
@@ -4,13 +4,10 @@
  */

 package org.eclipse.compare.internal;

 

-import java.io.IOException;

-

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

 

-import org.eclipse.jface.viewers.*;

 import org.eclipse.jface.text.source.SourceViewer;

 import org.eclipse.jface.text.Document;

 

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
index cd8bc44d1..e23a32d40 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
@@ -14,10 +14,8 @@ import org.eclipse.swt.widgets.*;
 import org.eclipse.jface.dialogs.*;

 import org.eclipse.jface.operation.*;

 import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.jface.util.Assert;

 

 import org.eclipse.core.runtime.*;

-import org.eclipse.compare.contentmergeviewer.*;

 

 /**

  * A modal dialog that displays progress during a long running operation.

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java
index d6a64cd6b..663fc0755 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java
@@ -12,8 +12,6 @@ import org.eclipse.compare.*;
 

 import org.eclipse.jface.viewers.Viewer;

 

-import org.eclipse.ui.internal.ViewerActionBuilder;

-

 /**

  * Creates <code>Viewer</code>s from an <code>IConfigurationElement</code>.

  */

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Hunk.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Hunk.java
index e49d5ad6a..1439733f4 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Hunk.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Hunk.java
@@ -6,9 +6,6 @@ package org.eclipse.compare.internal.patch;
 

 import java.util.List;

 

-import org.eclipse.jface.util.Assert;

-

-

 /**

  * A Hunk describes a range of changed lines and some context lines.

  */

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
index e238378d1..3f5433aae 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
@@ -23,8 +23,6 @@ import org.eclipse.ui.model.*;
 import org.eclipse.core.resources.*;

 import org.eclipse.core.runtime.*;

 

-import org.eclipse.compare.internal.Utilities;

-

 

 /* package */ class InputPatchPage extends WizardPage {

 

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareInput.java
index 3571ee9f2..b3029eba7 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareInput.java
@@ -10,7 +10,6 @@ import java.text.MessageFormat;
 import java.lang.reflect.InvocationTargetException;

 

 import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Composite;

 

 import org.eclipse.core.runtime.*;

 import org.eclipse.core.resources.*;

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java
index cd4cb28a6..cbd70a15a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java
@@ -4,10 +4,6 @@
  */

 package org.eclipse.compare.internal.patch;

 

-import org.eclipse.jface.dialogs.MessageDialog;

-

-import org.eclipse.compare.internal.ListDialog;

-

 public class PatchErrorDialog {

 	

 	private PatchErrorDialog() {

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
index 19d7fbd32..64e34c688 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
@@ -10,8 +10,6 @@ import org.eclipse.core.runtime.*;
 import org.eclipse.core.resources.*;

 

 import org.eclipse.compare.structuremergeviewer.Differencer;

-import org.eclipse.compare.internal.ExceptionHandler;

-

 

 /**

  * A Patcher 

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
index 4fa96b73e..771b54ba7 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
@@ -5,7 +5,6 @@
 package org.eclipse.compare.rangedifferencer;

 

 import java.util.ArrayList;

-import java.util.Iterator;

 import java.util.List;

 

 /**

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java
index 2c4d62bbc..4001856f4 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java
@@ -4,9 +4,6 @@
  */

 package org.eclipse.compare.rangedifferencer;

 

-import org.eclipse.jface.*;

-import org.eclipse.jface.util.Assert;

-

 /**

  * Description of a change between two or three ranges of comparable entities.

  * <p>

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java
index f101c35ba..cd47b3cc4 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java
@@ -4,10 +4,7 @@
  */

 package org.eclipse.compare.structuremergeviewer;

 

-import java.util.Iterator;

 import java.util.ArrayList;

-import org.eclipse.swt.graphics.Image;

-

 

 /**

  * The standard implementation of a diff container element.

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java
index 7174a95a3..ef51ba2a6 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java
@@ -6,7 +6,6 @@ package org.eclipse.compare.structuremergeviewer;
 

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.compare.ITypedElement;

-import org.eclipse.jface.util.Assert;

 

 /**

  * An abstract base implementation of the <code>IDiffElement</code> interface.

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
index 5cc5187eb..dbd859c1a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
@@ -14,14 +14,12 @@ import java.util.ResourceBundle;
 

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.DisposeEvent;

-import org.eclipse.swt.events.FocusListener;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.*;

 

 import org.eclipse.jface.util.*;

 import org.eclipse.jface.action.*;

 import org.eclipse.jface.viewers.*;

-import org.eclipse.jface.preference.IPreferenceStore;

 

 import org.eclipse.compare.internal.*;

 import org.eclipse.compare.*;

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 57073008b..6594fb1ae 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
@@ -7,16 +7,13 @@ package org.eclipse.compare.structuremergeviewer;
 import java.io.ByteArrayInputStream;

 import java.io.InputStream;

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import org.eclipse.jface.text.*;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.compare.*;

 import org.eclipse.compare.internal.Utilities;

-import org.eclipse.compare.contentmergeviewer.*;

 import org.eclipse.compare.contentmergeviewer.IDocumentRange;

-import org.eclipse.compare.contentmergeviewer.TextMergeViewer;

 

 

 /**

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java
index c87f30c5d..57ddee4aa 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java
@@ -4,8 +4,6 @@
  */

 package org.eclipse.compare.structuremergeviewer;

 

-import java.util.Iterator;

-

 /**

  * <code>IDiffContainer</code> is a <code>IDiffElement</code> with children.

  * <p>

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java
index 68626539f..7e5cb1563 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java
@@ -4,10 +4,6 @@
  */

 package org.eclipse.compare.structuremergeviewer;

 

-import java.util.Iterator;

-

-import org.eclipse.compare.ITypedElement;

-

 /**

  * Interface used to compare hierarchical structures.

  * It is used by the differencing engine.

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
index b94ae5ef5..472264a89 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
@@ -9,9 +9,6 @@
  */

 package org.eclipse.compare.structuremergeviewer;

 

-import org.eclipse.compare.ITypedElement;

-import org.eclipse.jface.text.IDocument;

-

 /**

  * Interface used to create a hierarchical structure of

  * <code>IStructureComparator</code>s for a given input object.

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 e14fcd302..969297d4f 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
@@ -11,17 +11,14 @@ package org.eclipse.compare;
 

 import java.lang.reflect.InvocationTargetException;

 

-import java.util.List;

 import java.util.ArrayList;

 import java.util.ResourceBundle;

 

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.*;

-import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.widgets.*;

 import org.eclipse.swt.graphics.Image;

 

-import org.eclipse.core.resources.IResource;

 import org.eclipse.core.runtime.*;

 import org.eclipse.ui.IPersistableElement;

 import org.eclipse.ui.IEditorInput;

@@ -35,7 +32,6 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.resource.ImageDescriptor;

 

-import org.eclipse.compare.contentmergeviewer.ContentMergeViewer;

 import org.eclipse.compare.internal.*;

 import org.eclipse.compare.structuremergeviewer.*;

 

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 db6faf3ce..5380fa438 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
@@ -22,9 +22,7 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.ui.plugin.AbstractUIPlugin;

 

 import org.eclipse.compare.internal.CompareUIPlugin;

-import org.eclipse.compare.internal.IStructureCreatorDescriptor;

 import org.eclipse.compare.structuremergeviewer.ICompareInput;

-import org.eclipse.compare.structuremergeviewer.IStructureCreator;

 

 

 /**

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 bb55909cb..7c6c1b829 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
@@ -11,7 +11,6 @@ package org.eclipse.compare;
 

 import java.text.MessageFormat;

 

-import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.*;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.*;

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 a43429c29..47f70f848 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
@@ -23,7 +23,6 @@ import java.text.*;
 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.*;

 import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.layout.GridData;

 import org.eclipse.swt.widgets.Widget;

 import org.eclipse.swt.widgets.Control;

@@ -42,8 +41,6 @@ import org.eclipse.jface.viewers.*;
 import org.eclipse.jface.util.Assert;

 import org.eclipse.jface.dialogs.*;

 

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFileState;

 import org.eclipse.core.runtime.CoreException;

 

 import org.eclipse.compare.internal.*;

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
index 6c488a159..558c48840 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/ResourceNode.java
@@ -6,7 +6,6 @@ package org.eclipse.compare;
 

 import java.io.*;

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import org.eclipse.swt.graphics.Image;

 

@@ -15,7 +14,6 @@ import org.eclipse.jface.util.Assert;
 import org.eclipse.core.resources.*;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

-import org.eclipse.compare.internal.Utilities;

 import org.eclipse.compare.structuremergeviewer.IStructureComparator;

 

 /**

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 469bca261..9869a9f5c 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
@@ -16,7 +16,6 @@ import java.util.zip.*;
 

 import org.eclipse.swt.graphics.Image;

 

-import org.eclipse.jface.text.IDocument;

 import org.eclipse.jface.util.Assert;

 

 import org.eclipse.core.runtime.CoreException;

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 71b2f0a38..81679fcba 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
@@ -31,7 +31,6 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.compare.*;

 import org.eclipse.compare.structuremergeviewer.*;

 import org.eclipse.compare.contentmergeviewer.IMergeViewerContentProvider;

-import org.eclipse.compare.contentmergeviewer.TextMergeViewer;

 import org.eclipse.compare.internal.*;

 

 /**

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 37d5ebfa8..24cc327a6 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
@@ -15,8 +15,6 @@ import java.util.Iterator;
 import java.util.Map;

 import java.util.HashMap;

 import java.util.ResourceBundle;

-import java.io.InputStream;

-import java.io.IOException;

 import java.io.UnsupportedEncodingException;

 import java.text.MessageFormat;

 

@@ -37,10 +35,8 @@ import org.eclipse.swt.custom.*;
 

 import org.eclipse.jface.action.*;

 import org.eclipse.jface.text.*;

-import org.eclipse.jface.text.source.SourceViewer;

 import org.eclipse.jface.util.PropertyChangeEvent;

 import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.jface.dialogs.MessageDialog;

@@ -50,7 +46,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.CoreException;

 

-import org.eclipse.ui.texteditor.IUpdate;

 import org.eclipse.ui.IActionBars;

 import org.eclipse.ui.IWorkbenchActionConstants;

 

@@ -59,12 +54,8 @@ import org.eclipse.compare.internal.MergeSourceViewer;
 import org.eclipse.compare.internal.BufferedCanvas;

 import org.eclipse.compare.internal.Utilities;

 import org.eclipse.compare.internal.TokenComparator;

-import org.eclipse.compare.internal.ChangePropertyAction;

-import org.eclipse.compare.internal.CompareEditor;

 import org.eclipse.compare.internal.DocLineComparator;

 import org.eclipse.compare.internal.ComparePreferencePage;

-import org.eclipse.compare.internal.CompareUIPlugin;

-import org.eclipse.compare.internal.MergeViewerAction;

 import org.eclipse.compare.internal.INavigatable;

 import org.eclipse.compare.internal.CompareNavigator;

 import org.eclipse.compare.internal.TimeoutContext;

@@ -158,7 +149,7 @@ public class TextMergeViewer extends ContentMergeViewer  {
 	/** Width of birds eye view */

 	private static final int BIRDS_EYE_VIEW_INSET= 1;

 	/** Use splines between diff ranges */

-	private static final boolean USE_SPLINES= false;

+	private static final boolean USE_SPLINES= true;

 

 	/** line width of change borders */

 	private static final int LW= 1;

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
index c1ff3bda9..80c826ba3 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
@@ -5,7 +5,6 @@
 package org.eclipse.compare.internal;

 

 import java.io.*;

-import java.lang.reflect.InvocationTargetException;

 import java.util.ResourceBundle;

 import java.text.MessageFormat;

 

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
index 6ef8059a2..a30087d98 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
@@ -4,9 +4,6 @@
  */

 package org.eclipse.compare.internal;

 

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.KeyAdapter;

-import org.eclipse.swt.events.KeyEvent;

 import org.eclipse.swt.widgets.Control;

 import org.eclipse.swt.widgets.Display;

 

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index e4dd22515..8fff81873 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -13,7 +13,6 @@ import org.eclipse.swt.layout.*;
 import org.eclipse.swt.events.*;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.RGB;

 

 import org.eclipse.jface.preference.*;

 import org.eclipse.jface.util.*;

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index a55ff322c..7d006a37e 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -11,20 +11,17 @@ import java.net.MalformedURLException;
 import java.lang.reflect.InvocationTargetException;

 import java.util.*;

 

-import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Shell;

 

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.util.Assert;

 import org.eclipse.jface.preference.IPreferenceStore;

 

-import org.eclipse.ui.internal.SharedImages;

 import org.eclipse.core.runtime.*;

 import org.eclipse.ui.model.IWorkbenchAdapter;

 import org.eclipse.ui.*;

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java
index 8373bed55..b7acc1de7 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ImageMergeViewer.java
@@ -4,7 +4,6 @@
  */

 package org.eclipse.compare.internal;

 

-import java.io.ByteArrayInputStream;

 import java.io.InputStream;

 import java.io.IOException;

 import java.util.ResourceBundle;

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
index 307a1d139..10a4f3378 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/MergeSourceViewer.java
@@ -16,14 +16,9 @@ import org.eclipse.swt.graphics.Font;
 import org.eclipse.jface.action.*;

 import org.eclipse.jface.viewers.*;

 import org.eclipse.jface.text.*;

-import org.eclipse.jface.util.*;

 import org.eclipse.jface.text.source.*;

 

-import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.ui.texteditor.IUpdate;

-import org.eclipse.ui.IWorkbenchActionConstants;

-

-import org.eclipse.compare.contentmergeviewer.TextMergeViewer;

-

+import org.eclipse.jface.viewers.SelectionChangedEvent;


 /**

  * Extends the JFace SourceViewer with some convenience methods.

  */

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java
index fd7a885bd..5eb45e72f 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java
@@ -4,13 +4,10 @@
  */

 package org.eclipse.compare.internal;

 

-import java.io.IOException;

-

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

 

-import org.eclipse.jface.viewers.*;

 import org.eclipse.jface.text.source.SourceViewer;

 import org.eclipse.jface.text.Document;

 

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
index cd8bc44d1..e23a32d40 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
@@ -14,10 +14,8 @@ import org.eclipse.swt.widgets.*;
 import org.eclipse.jface.dialogs.*;

 import org.eclipse.jface.operation.*;

 import org.eclipse.jface.resource.JFaceResources;

-import org.eclipse.jface.util.Assert;

 

 import org.eclipse.core.runtime.*;

-import org.eclipse.compare.contentmergeviewer.*;

 

 /**

  * A modal dialog that displays progress during a long running operation.

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java
index d6a64cd6b..663fc0755 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ViewerDescriptor.java
@@ -12,8 +12,6 @@ import org.eclipse.compare.*;
 

 import org.eclipse.jface.viewers.Viewer;

 

-import org.eclipse.ui.internal.ViewerActionBuilder;

-

 /**

  * Creates <code>Viewer</code>s from an <code>IConfigurationElement</code>.

  */

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Hunk.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Hunk.java
index e49d5ad6a..1439733f4 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Hunk.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Hunk.java
@@ -6,9 +6,6 @@ package org.eclipse.compare.internal.patch;
 

 import java.util.List;

 

-import org.eclipse.jface.util.Assert;

-

-

 /**

  * A Hunk describes a range of changed lines and some context lines.

  */

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
index e238378d1..3f5433aae 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
@@ -23,8 +23,6 @@ import org.eclipse.ui.model.*;
 import org.eclipse.core.resources.*;

 import org.eclipse.core.runtime.*;

 

-import org.eclipse.compare.internal.Utilities;

-

 

 /* package */ class InputPatchPage extends WizardPage {

 

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareInput.java
index 3571ee9f2..b3029eba7 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareInput.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchCompareInput.java
@@ -10,7 +10,6 @@ import java.text.MessageFormat;
 import java.lang.reflect.InvocationTargetException;

 

 import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Composite;

 

 import org.eclipse.core.runtime.*;

 import org.eclipse.core.resources.*;

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java
index cd4cb28a6..cbd70a15a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchErrorDialog.java
@@ -4,10 +4,6 @@
  */

 package org.eclipse.compare.internal.patch;

 

-import org.eclipse.jface.dialogs.MessageDialog;

-

-import org.eclipse.compare.internal.ListDialog;

-

 public class PatchErrorDialog {

 	

 	private PatchErrorDialog() {

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
index 19d7fbd32..64e34c688 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
@@ -10,8 +10,6 @@ import org.eclipse.core.runtime.*;
 import org.eclipse.core.resources.*;

 

 import org.eclipse.compare.structuremergeviewer.Differencer;

-import org.eclipse.compare.internal.ExceptionHandler;

-

 

 /**

  * A Patcher 

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
index 4fa96b73e..771b54ba7 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java
@@ -5,7 +5,6 @@
 package org.eclipse.compare.rangedifferencer;

 

 import java.util.ArrayList;

-import java.util.Iterator;

 import java.util.List;

 

 /**

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java
index 2c4d62bbc..4001856f4 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java
@@ -4,9 +4,6 @@
  */

 package org.eclipse.compare.rangedifferencer;

 

-import org.eclipse.jface.*;

-import org.eclipse.jface.util.Assert;

-

 /**

  * Description of a change between two or three ranges of comparable entities.

  * <p>

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java
index f101c35ba..cd47b3cc4 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffContainer.java
@@ -4,10 +4,7 @@
  */

 package org.eclipse.compare.structuremergeviewer;

 

-import java.util.Iterator;

 import java.util.ArrayList;

-import org.eclipse.swt.graphics.Image;

-

 

 /**

  * The standard implementation of a diff container element.

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java
index 7174a95a3..ef51ba2a6 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffElement.java
@@ -6,7 +6,6 @@ package org.eclipse.compare.structuremergeviewer;
 

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.compare.ITypedElement;

-import org.eclipse.jface.util.Assert;

 

 /**

  * An abstract base implementation of the <code>IDiffElement</code> interface.

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
index 5cc5187eb..dbd859c1a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
@@ -14,14 +14,12 @@ import java.util.ResourceBundle;
 

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.DisposeEvent;

-import org.eclipse.swt.events.FocusListener;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.widgets.*;

 

 import org.eclipse.jface.util.*;

 import org.eclipse.jface.action.*;

 import org.eclipse.jface.viewers.*;

-import org.eclipse.jface.preference.IPreferenceStore;

 

 import org.eclipse.compare.internal.*;

 import org.eclipse.compare.*;

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 57073008b..6594fb1ae 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
@@ -7,16 +7,13 @@ package org.eclipse.compare.structuremergeviewer;
 import java.io.ByteArrayInputStream;

 import java.io.InputStream;

 import java.util.ArrayList;

-import java.util.Iterator;

 

 import org.eclipse.jface.text.*;

 

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.compare.*;

 import org.eclipse.compare.internal.Utilities;

-import org.eclipse.compare.contentmergeviewer.*;

 import org.eclipse.compare.contentmergeviewer.IDocumentRange;

-import org.eclipse.compare.contentmergeviewer.TextMergeViewer;

 

 

 /**

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java
index c87f30c5d..57ddee4aa 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IDiffContainer.java
@@ -4,8 +4,6 @@
  */

 package org.eclipse.compare.structuremergeviewer;

 

-import java.util.Iterator;

-

 /**

  * <code>IDiffContainer</code> is a <code>IDiffElement</code> with children.

  * <p>

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java
index 68626539f..7e5cb1563 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureComparator.java
@@ -4,10 +4,6 @@
  */

 package org.eclipse.compare.structuremergeviewer;

 

-import java.util.Iterator;

-

-import org.eclipse.compare.ITypedElement;

-

 /**

  * Interface used to compare hierarchical structures.

  * It is used by the differencing engine.

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
index b94ae5ef5..472264a89 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/IStructureCreator.java
@@ -9,9 +9,6 @@
  */

 package org.eclipse.compare.structuremergeviewer;

 

-import org.eclipse.compare.ITypedElement;

-import org.eclipse.jface.text.IDocument;

-

 /**

  * Interface used to create a hierarchical structure of

  * <code>IStructureComparator</code>s for a given input object.