Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-03-13 11:30:09 +0000
committerAndre Weinand2002-03-13 11:30:09 +0000
commite688dd4cbd7cf89ff7461f16a0f78501e825154b (patch)
tree1d4ab58b40787f97db8e3d8cd4be2cf626ff6017
parentec9ca91b57f3192c673f1a6e54a65ad08899119c (diff)
downloadeclipse.platform.team-e688dd4cbd7cf89ff7461f16a0f78501e825154b.tar.gz
eclipse.platform.team-e688dd4cbd7cf89ff7461f16a0f78501e825154b.tar.xz
eclipse.platform.team-e688dd4cbd7cf89ff7461f16a0f78501e825154b.zip
Renamed internal class TextViewer to SimpleTextViewer
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html26
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java14
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java2
-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.java2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html26
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java14
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java (renamed from bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewer.java)4
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java2
10 files changed, 76 insertions, 20 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index ba0c3d36f..96618475f 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,6 +11,32 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input March 18th 2002
+
+<h2>
+What's new in this drop</h2>
+
+<h3>
+API changes</h3>
+
+<h3>
+API Additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input March 12th 2002
<h2>
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
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index ba0c3d36f..96618475f 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -11,6 +11,32 @@
<h1>
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input March 18th 2002
+
+<h2>
+What's new in this drop</h2>
+
+<h3>
+API changes</h3>
+
+<h3>
+API Additions</h3>
+
+<h3>
+Other highlights</h3>
+
+<h2>
+Known deficiencies</h2>
+
+<h2>
+Problem reports fixed</h2>
+
+
+<h2>
+Problem reports closed</h2>
+
+<h1>
+<hr WIDTH="100%"></h1>
Eclipse Build Input March 12th 2002
<h2>
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 2530338e9..e011a507f 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
@@ -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/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 1edccfb27..efd9eea57 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
@@ -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/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/SimpleTextViewer.java
index a556a6f7f..fd7a885bd 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewer.java
+++ b/bundles/org.eclipse.compare/plugins/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/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java
index 96bc4df64..554114cd5 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/TextViewerCreator.java
+++ b/bundles/org.eclipse.compare/plugins/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

Back to the top