diff options
author | Dani Megert | 2013-02-27 13:29:27 +0000 |
---|---|---|
committer | Dani Megert | 2013-02-27 13:29:27 +0000 |
commit | 55981afe29f9a8b0f96c01c204fa741932d7b3d1 (patch) | |
tree | 7ec6464d8c9e679a015eb0b5641cdb98eb2ac27c | |
parent | 4743bcb5dbead42e841b0cd0f2c323ede4614d53 (diff) | |
download | eclipse.platform.team-55981afe29f9a8b0f96c01c204fa741932d7b3d1.tar.gz eclipse.platform.team-55981afe29f9a8b0f96c01c204fa741932d7b3d1.tar.xz eclipse.platform.team-55981afe29f9a8b0f96c01c204fa741932d7b3d1.zip |
Revert "Fixed bug 309124: [compare] Java Source Compare does not show whitespace characters in folder compare and in Compare With > Git Index"I20130227-2000
This reverts commit 51464728dbc3bb8f52da74ee420b9648150e22ea.
-rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java | 211 |
1 files changed, 96 insertions, 115 deletions
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 dee6a407a..727a07943 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 @@ -27,56 +27,51 @@ import java.util.List; import java.util.Map; import java.util.ResourceBundle; -import com.ibm.icu.text.MessageFormat; - -import org.eclipse.osgi.util.NLS; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.accessibility.AccessibleAdapter; -import org.eclipse.swt.accessibility.AccessibleEvent; -import org.eclipse.swt.custom.LineBackgroundEvent; -import org.eclipse.swt.custom.LineBackgroundListener; -import org.eclipse.swt.custom.StyleRange; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.swt.events.DisposeEvent; -import org.eclipse.swt.events.DisposeListener; -import org.eclipse.swt.events.FocusAdapter; -import org.eclipse.swt.events.FocusEvent; -import org.eclipse.swt.events.KeyAdapter; -import org.eclipse.swt.events.KeyEvent; -import org.eclipse.swt.events.MouseAdapter; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseMoveListener; -import org.eclipse.swt.events.PaintEvent; -import org.eclipse.swt.events.PaintListener; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.VerifyEvent; -import org.eclipse.swt.events.VerifyListener; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Cursor; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.GC; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Canvas; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.ScrollBar; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.TypedListener; - +import org.eclipse.compare.CompareConfiguration; +import org.eclipse.compare.CompareNavigator; +import org.eclipse.compare.CompareUI; +import org.eclipse.compare.ICompareNavigator; +import org.eclipse.compare.IEditableContentExtension; +import org.eclipse.compare.IEncodedStreamContentAccessor; +import org.eclipse.compare.INavigatable; +import org.eclipse.compare.ISharedDocumentAdapter; +import org.eclipse.compare.IStreamContentAccessor; +import org.eclipse.compare.ITypedElement; +import org.eclipse.compare.SharedDocumentAdapter; +import org.eclipse.compare.internal.BufferedCanvas; +import org.eclipse.compare.internal.ChangePropertyAction; +import org.eclipse.compare.internal.CompareEditor; +import org.eclipse.compare.internal.CompareEditorSelectionProvider; +import org.eclipse.compare.internal.CompareHandlerService; +import org.eclipse.compare.internal.CompareMessages; +import org.eclipse.compare.internal.ComparePreferencePage; +import org.eclipse.compare.internal.CompareUIPlugin; +import org.eclipse.compare.internal.DocumentManager; +import org.eclipse.compare.internal.ICompareContextIds; +import org.eclipse.compare.internal.ICompareUIConstants; +import org.eclipse.compare.internal.IMergeViewerTestAdapter; +import org.eclipse.compare.internal.MergeSourceViewer; +import org.eclipse.compare.internal.MergeViewerContentProvider; +import org.eclipse.compare.internal.NavigationEndDialog; +import org.eclipse.compare.internal.OutlineViewerCreator; +import org.eclipse.compare.internal.ShowWhitespaceAction; +import org.eclipse.compare.internal.TextEditorPropertyAction; +import org.eclipse.compare.internal.Utilities; +import org.eclipse.compare.internal.merge.DocumentMerger; +import org.eclipse.compare.internal.merge.DocumentMerger.Diff; +import org.eclipse.compare.internal.merge.DocumentMerger.IDocumentMergerInput; +import org.eclipse.compare.patch.IHunk; +import org.eclipse.compare.rangedifferencer.RangeDifference; +import org.eclipse.compare.structuremergeviewer.DiffNode; +import org.eclipse.compare.structuremergeviewer.DocumentRangeNode; +import org.eclipse.compare.structuremergeviewer.ICompareInput; +import org.eclipse.compare.structuremergeviewer.IDiffContainer; +import org.eclipse.compare.structuremergeviewer.IDiffElement; import org.eclipse.core.commands.operations.IOperationHistoryListener; import org.eclipse.core.commands.operations.IUndoableOperation; import org.eclipse.core.commands.operations.OperationHistoryEvent; import org.eclipse.core.commands.operations.OperationHistoryFactory; - +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; @@ -84,11 +79,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; - import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.IAction; @@ -101,17 +91,6 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.resource.ColorRegistry; import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.jface.util.Util; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.window.Window; - import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadPositionCategoryException; import org.eclipse.jface.text.CursorLinePainter; @@ -137,7 +116,57 @@ import org.eclipse.jface.text.source.CompositeRuler; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.jface.text.source.SourceViewerConfiguration; - +import org.eclipse.jface.util.IPropertyChangeListener; +import org.eclipse.jface.util.PropertyChangeEvent; +import org.eclipse.jface.util.Util; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.ISelectionProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.window.Window; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.accessibility.AccessibleAdapter; +import org.eclipse.swt.accessibility.AccessibleEvent; +import org.eclipse.swt.custom.LineBackgroundEvent; +import org.eclipse.swt.custom.LineBackgroundListener; +import org.eclipse.swt.custom.StyleRange; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; +import org.eclipse.swt.events.FocusAdapter; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.KeyAdapter; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.MouseAdapter; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.MouseMoveListener; +import org.eclipse.swt.events.PaintEvent; +import org.eclipse.swt.events.PaintListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.VerifyEvent; +import org.eclipse.swt.events.VerifyListener; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Cursor; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.GC; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.RGB; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Canvas; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.ScrollBar; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.TypedListener; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IKeyBindingService; @@ -151,9 +180,10 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.contexts.IContextService; -import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.editors.text.EditorsUI; +import org.eclipse.ui.editors.text.IEncodingSupport; +import org.eclipse.ui.editors.text.IStorageDocumentProvider; import org.eclipse.ui.progress.UIJob; - import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants; import org.eclipse.ui.texteditor.AbstractTextEditor; import org.eclipse.ui.texteditor.ChainedPreferenceStore; @@ -167,51 +197,7 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.SourceViewerDecorationSupport; -import org.eclipse.ui.editors.text.EditorsUI; -import org.eclipse.ui.editors.text.IEncodingSupport; -import org.eclipse.ui.editors.text.IStorageDocumentProvider; - -import org.eclipse.compare.CompareConfiguration; -import org.eclipse.compare.CompareNavigator; -import org.eclipse.compare.CompareUI; -import org.eclipse.compare.ICompareNavigator; -import org.eclipse.compare.IEditableContentExtension; -import org.eclipse.compare.IEncodedStreamContentAccessor; -import org.eclipse.compare.INavigatable; -import org.eclipse.compare.IResourceProvider; -import org.eclipse.compare.ISharedDocumentAdapter; -import org.eclipse.compare.IStreamContentAccessor; -import org.eclipse.compare.ITypedElement; -import org.eclipse.compare.SharedDocumentAdapter; -import org.eclipse.compare.internal.BufferedCanvas; -import org.eclipse.compare.internal.ChangePropertyAction; -import org.eclipse.compare.internal.CompareEditor; -import org.eclipse.compare.internal.CompareEditorSelectionProvider; -import org.eclipse.compare.internal.CompareHandlerService; -import org.eclipse.compare.internal.CompareMessages; -import org.eclipse.compare.internal.ComparePreferencePage; -import org.eclipse.compare.internal.CompareUIPlugin; -import org.eclipse.compare.internal.DocumentManager; -import org.eclipse.compare.internal.ICompareContextIds; -import org.eclipse.compare.internal.ICompareUIConstants; -import org.eclipse.compare.internal.IMergeViewerTestAdapter; -import org.eclipse.compare.internal.MergeSourceViewer; -import org.eclipse.compare.internal.MergeViewerContentProvider; -import org.eclipse.compare.internal.NavigationEndDialog; -import org.eclipse.compare.internal.OutlineViewerCreator; -import org.eclipse.compare.internal.ShowWhitespaceAction; -import org.eclipse.compare.internal.TextEditorPropertyAction; -import org.eclipse.compare.internal.Utilities; -import org.eclipse.compare.internal.merge.DocumentMerger; -import org.eclipse.compare.internal.merge.DocumentMerger.Diff; -import org.eclipse.compare.internal.merge.DocumentMerger.IDocumentMergerInput; -import org.eclipse.compare.patch.IHunk; -import org.eclipse.compare.rangedifferencer.RangeDifference; -import org.eclipse.compare.structuremergeviewer.DiffNode; -import org.eclipse.compare.structuremergeviewer.DocumentRangeNode; -import org.eclipse.compare.structuremergeviewer.ICompareInput; -import org.eclipse.compare.structuremergeviewer.IDiffContainer; -import org.eclipse.compare.structuremergeviewer.IDiffElement; +import com.ibm.icu.text.MessageFormat; /** * A text merge viewer uses the <code>RangeDifferencer</code> to perform a @@ -953,11 +939,6 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { if (sda != null) { return sda.getDocumentKey(fElement); } - if (fElement instanceof IResourceProvider) { - IResource resource= ((IResourceProvider)fElement).getResource(); - if ((resource instanceof IFile) && ((IFile)resource).exists()) - return new FileEditorInput((IFile)resource); - } } return null; } |