Google Git Google Git
Sign in
eclipse/platform/eclipse.platform.team/refs/heads/branch_20060714_FileBuffers^!/.
commit
b234483552c258fd85730abfa394d6c409eec0b5
[log]
author
Michael Valenta <mvalenta>
Wed Sep 06 18:03:26 2006 +0000
committer
Michael Valenta <mvalenta>
Wed Sep 06 18:03:26 2006 +0000
tree
3d9e5321f6766d1f31fddfe074f8ddbc40d46f4d
parent
484ef9c626a869ee63d32ed9d48d4dc962bd51dd [diff] 
Last minute fix

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 f894c7d..a9ce06f 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 @@
 			}
 		} 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 88f808a..a3287cc 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 @@
 			}
 		} 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 f894c7d..a9ce06f 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 @@
 			}
 		} 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 88f808a..a3287cc 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 @@
 			}
 		} 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);
 				}
 			}
 		}