Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2001-07-18 04:32:39 -0400
committerAndre Weinand2001-07-18 04:32:39 -0400
commitbb7c6283de459b000f603c3f2164740e34a7a8e2 (patch)
treec5f4257e39060e9e7cb89ff46433d42ceaac949b /bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer
parent33300f9edd058265c1d76b3490398bd3308866f6 (diff)
downloadeclipse.platform.team-bb7c6283de459b000f603c3f2164740e34a7a8e2.tar.gz
eclipse.platform.team-bb7c6283de459b000f603c3f2164740e34a7a8e2.tar.xz
eclipse.platform.team-bb7c6283de459b000f603c3f2164740e34a7a8e2.zip
Fixed a comment
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentRangeNode.java22
1 files changed, 11 insertions, 11 deletions
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 fb585e18d..dd50c8e05 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
@@ -324,16 +324,16 @@ public class DocumentRangeNode
if (child != null) { // there is a destination
- if (child instanceof DocumentRangeNode) {
- DocumentRangeNode drn= (DocumentRangeNode) child;
-
- IDocument doc= drn.getDocument();
- Position range= drn.getRange();
- try {
- doc.replace(range.getOffset(), range.getLength(), srcContents);
- } catch (BadLocationException ex) {
- }
- }
+// if (child instanceof DocumentRangeNode) {
+// DocumentRangeNode drn= (DocumentRangeNode) child;
+//
+// IDocument doc= drn.getDocument();
+// Position range= drn.getRange();
+// try {
+// doc.replace(range.getOffset(), range.getLength(), srcContents);
+// } catch (BadLocationException ex) {
+// }
+// }
} else {
// no destination: we have to add the contents into the parent
add(srcContents, null /*srcParentNode*/, src);
@@ -345,7 +345,7 @@ public class DocumentRangeNode
* see IEditableContent.setContent
*/
public void setContent(byte[] content) {
- fBaseDocument.set(new String(content));
+// fBaseDocument.set(new String(content));
}
}

Back to the top