diff options
author | Andre Weinand | 2002-03-13 11:30:09 +0000 |
---|---|---|
committer | Andre Weinand | 2002-03-13 11:30:09 +0000 |
commit | e688dd4cbd7cf89ff7461f16a0f78501e825154b (patch) | |
tree | 1d4ab58b40787f97db8e3d8cd4be2cf626ff6017 /bundles/org.eclipse.compare/compare/org/eclipse | |
parent | ec9ca91b57f3192c673f1a6e54a65ad08899119c (diff) | |
download | eclipse.platform.team-e688dd4cbd7cf89ff7461f16a0f78501e825154b.tar.gz eclipse.platform.team-e688dd4cbd7cf89ff7461f16a0f78501e825154b.tar.xz eclipse.platform.team-e688dd4cbd7cf89ff7461f16a0f78501e825154b.zip |
Renamed internal class TextViewer to SimpleTextViewer
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse')
-rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java | 14 | ||||
-rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java (renamed from bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewer.java) | 4 | ||||
-rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java | 2 |
4 files changed, 12 insertions, 10 deletions
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 2530338e9..e011a507f 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java @@ -207,12 +207,14 @@ public abstract class CompareViewerSwitchingPane extends CompareViewerPane boolean hadFocus= hasFocus2();
-// try {
-// if (fViewer != null)
-// fViewer.setInput(null); // force save before switching viewer
-// } catch (ViewerSwitchingCancelled ex) {
-// return;
-// }
+ /*
+ try {
+ if (fViewer != null)
+ fViewer.setInput(null); // force save before switching viewer
+ } catch (ViewerSwitchingCancelled ex) {
+ return;
+ }
+ */
fInput= input;
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 1edccfb27..efd9eea57 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 @@ -613,7 +613,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin { return viewer;
}
// fallback
- return new TextViewer(parent);
+ return new SimpleTextViewer(parent);
}
ICompareInput input= (ICompareInput) in;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java index a556a6f7f..fd7a885bd 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java @@ -19,13 +19,13 @@ import org.eclipse.compare.*; import org.eclipse.compare.structuremergeviewer.ICompareInput;
-public class TextViewer extends AbstractViewer {
+public class SimpleTextViewer extends AbstractViewer {
private SourceViewer fSourceViewer;
private ICompareInput fInput;
- TextViewer(Composite parent) {
+ SimpleTextViewer(Composite parent) {
fSourceViewer= new SourceViewer(parent, null, SWT.H_SCROLL + SWT.V_SCROLL);
fSourceViewer.setEditable(false);
}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java index 96bc4df64..554114cd5 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java @@ -21,6 +21,6 @@ import org.eclipse.compare.IViewerCreator; public class TextViewerCreator implements IViewerCreator {
public Viewer createViewer(Composite parent, CompareConfiguration mp) {
- return new TextViewer(parent);
+ return new SimpleTextViewer(parent);
}
}
\ No newline at end of file |