Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-04-19 13:33:28 -0400
committerAndre Weinand2004-04-19 13:33:28 -0400
commit190b45ceec65a7971686966ab12e7df31f4e1d87 (patch)
tree122886a2053eca4e97f146d0a0996c5448c8a951
parentce86164934d392b2ec8efed0318cc2d4d4aa6207 (diff)
downloadeclipse.platform.team-190b45ceec65a7971686966ab12e7df31f4e1d87.tar.gz
eclipse.platform.team-190b45ceec65a7971686966ab12e7df31f4e1d87.tar.xz
eclipse.platform.team-190b45ceec65a7971686966ab12e7df31f4e1d87.zip
more work on #54091
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java (renamed from bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextMerger.java)2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java (renamed from bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextMerger.java)2
-rw-r--r--tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java4
5 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java
index 49414b1b0..90af61a40 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java
@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.IStatus;
* <code>org.eclipse.compare.streamMergers</code> extension point.
* </p>
*
- * @see org.eclipse.compare.internal.merge.TextMerger
+ * @see org.eclipse.compare.internal.merge.TextStreamMerger
*
* @since 3.0
*/
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextMerger.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java
index 93caa32bf..9c57dbe2c 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextMerger.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java
@@ -15,7 +15,7 @@ import org.eclipse.core.runtime.Status;
/**
* A simple merger for streams containing text lines.
*/
-public class TextMerger implements IStreamMerger {
+public class TextStreamMerger implements IStreamMerger {
/*
* (non-Javadoc)
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java
index 49414b1b0..90af61a40 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/IStreamMerger.java
@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.IStatus;
* <code>org.eclipse.compare.streamMergers</code> extension point.
* </p>
*
- * @see org.eclipse.compare.internal.merge.TextMerger
+ * @see org.eclipse.compare.internal.merge.TextStreamMerger
*
* @since 3.0
*/
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextMerger.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java
index 93caa32bf..9c57dbe2c 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextMerger.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java
@@ -15,7 +15,7 @@ import org.eclipse.core.runtime.Status;
/**
* A simple merger for streams containing text lines.
*/
-public class TextMerger implements IStreamMerger {
+public class TextStreamMerger implements IStreamMerger {
/*
* (non-Javadoc)
diff --git a/tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java b/tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java
index 94b661ae1..3e3884e09 100644
--- a/tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java
+++ b/tests/org.eclipse.compare.tests/JUnit Tests/org/eclipse/compare/tests/StreamMergerTest.java
@@ -14,7 +14,7 @@ import java.io.UnsupportedEncodingException;
import junit.framework.TestCase;
import org.eclipse.compare.IStreamMerger;
-import org.eclipse.compare.internal.merge.TextMerger;
+import org.eclipse.compare.internal.merge.TextStreamMerger;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -138,7 +138,7 @@ public class StreamMergerTest extends TestCase {
ByteArrayOutputStream os= new ByteArrayOutputStream();
- IStreamMerger merger= new TextMerger();
+ IStreamMerger merger= new TextStreamMerger();
IStatus status= merger.merge(os, encoding, ancestor, encoding, target, encoding, other, encoding, (IProgressMonitor)null);
output.append(new String(os.toByteArray(), encoding));

Back to the top