Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-09-06 18:03:26 +0000
committerMichael Valenta2006-09-06 18:03:26 +0000
commitb234483552c258fd85730abfa394d6c409eec0b5 (patch)
tree3d9e5321f6766d1f31fddfe074f8ddbc40d46f4d
parent484ef9c626a869ee63d32ed9d48d4dc962bd51dd (diff)
downloadeclipse.platform.team-branch_20060714_FileBuffers.tar.gz
eclipse.platform.team-branch_20060714_FileBuffers.tar.xz
eclipse.platform.team-branch_20060714_FileBuffers.zip
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java3
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java3
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java3
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java3
4 files changed, 8 insertions, 4 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 f894c7dc8..a9ce06f12 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
@@ -1234,10 +1234,11 @@ public class TextMergeViewer extends ContentMergeViewer {
}
} else {
IDocumentExtension3 ex3 = (IDocumentExtension3) document;
- if (ex3.getDocumentPartitioner(partitioning) != null) {
+ if (ex3.getDocumentPartitioner(partitioning) == null) {
IDocumentPartitioner partitioner= getDocumentPartitioner();
if (partitioner != null) {
ex3.setDocumentPartitioner(partitioning, partitioner);
+ partitioner.connect(document);
}
}
}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java
index 88f808a68..a3287cc0d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java
@@ -124,10 +124,11 @@ public abstract class DocumentStructureCreator implements IStructureCreator2 {
}
} else {
IDocumentExtension3 ex3 = (IDocumentExtension3) document;
- if (ex3.getDocumentPartitioner(partitioning) != null) {
+ if (ex3.getDocumentPartitioner(partitioning) == null) {
IDocumentPartitioner partitioner= getDocumentPartitioner();
if (partitioner != null) {
ex3.setDocumentPartitioner(partitioning, partitioner);
+ partitioner.connect(document);
}
}
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index f894c7dc8..a9ce06f12 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -1234,10 +1234,11 @@ public class TextMergeViewer extends ContentMergeViewer {
}
} else {
IDocumentExtension3 ex3 = (IDocumentExtension3) document;
- if (ex3.getDocumentPartitioner(partitioning) != null) {
+ if (ex3.getDocumentPartitioner(partitioning) == null) {
IDocumentPartitioner partitioner= getDocumentPartitioner();
if (partitioner != null) {
ex3.setDocumentPartitioner(partitioning, partitioner);
+ partitioner.connect(document);
}
}
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java
index 88f808a68..a3287cc0d 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DocumentStructureCreator.java
@@ -124,10 +124,11 @@ public abstract class DocumentStructureCreator implements IStructureCreator2 {
}
} else {
IDocumentExtension3 ex3 = (IDocumentExtension3) document;
- if (ex3.getDocumentPartitioner(partitioning) != null) {
+ if (ex3.getDocumentPartitioner(partitioning) == null) {
IDocumentPartitioner partitioner= getDocumentPartitioner();
if (partitioner != null) {
ex3.setDocumentPartitioner(partitioning, partitioner);
+ partitioner.connect(document);
}
}
}

Back to the top