Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2008-05-13 10:16:03 +0000
committerDani Megert2008-05-13 10:16:03 +0000
commit4d8ce3a8d21f80a8cefab972ff52eeda4ab61c1e (patch)
tree213eb80ed9c785c0c4fd258dc9da2b04e87ff119 /org.eclipse.text/projection/org/eclipse/jface
parent333270ebcc5e9cb08f7e62161f70a9a9f2725cc1 (diff)
downloadeclipse.platform.text-4d8ce3a8d21f80a8cefab972ff52eeda4ab61c1e.tar.gz
eclipse.platform.text-4d8ce3a8d21f80a8cefab972ff52eeda4ab61c1e.tar.xz
eclipse.platform.text-4d8ce3a8d21f80a8cefab972ff52eeda4ab61c1e.zip
Fixed bug 231073: Fix for bug 185773 breaks binary compatibility
Diffstat (limited to 'org.eclipse.text/projection/org/eclipse/jface')
-rw-r--r--org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocument.java6
-rw-r--r--org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocument.java19
-rw-r--r--org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocumentManager.java6
3 files changed, 23 insertions, 8 deletions
diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocument.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocument.java
index 2f8d44f9805..3ce55747abe 100644
--- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocument.java
+++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ChildDocument.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,6 +23,8 @@ import org.eclipse.jface.text.Position;
* Internal class. This class is not intended to be used by clients.</p>
*
* @since 3.0
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ChildDocument extends ProjectionDocument {
@@ -91,7 +93,7 @@ public class ChildDocument extends ProjectionDocument {
* @return the parent document range of this child document
*/
public Position getParentDocumentRange() {
- IRegion coverage= getProjectionMapping().getCoverage();
+ IRegion coverage= getDocumentInformationMapping().getCoverage();
return new VisibleRegion(coverage.getOffset(), coverage.getLength());
}
}
diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocument.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocument.java
index 25fefc47391..073ee1c1e23 100644
--- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocument.java
+++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocument.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -56,6 +56,8 @@ import org.eclipse.jface.text.TextUtilities;
* package.</p>
*
* @since 3.0
+ * @noinstantiate This class is not intended to be instantiated by clients.
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ProjectionDocument extends AbstractDocument {
@@ -180,10 +182,21 @@ public class ProjectionDocument extends AbstractDocument {
/**
* Returns the projection mapping used by this document.
- *
+ *
+ * @return the projection mapping used by this document
+ * @deprecated As of 3.4, replaced by {@link #getDocumentInformationMapping()}
+ */
+ public ProjectionMapping getProjectionMapping(){
+ return fMapping;
+ }
+
+ /**
+ * Returns the projection mapping used by this document.
+ *
* @return the projection mapping used by this document
+ * @since 3.4
*/
- public IDocumentInformationMapping getProjectionMapping(){
+ public IDocumentInformationMapping getDocumentInformationMapping() {
return fMapping;
}
diff --git a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocumentManager.java b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocumentManager.java
index 0d8ea9e4d07..4f3cde301ec 100644
--- a/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocumentManager.java
+++ b/org.eclipse.text/projection/org/eclipse/jface/text/projection/ProjectionDocumentManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.jface.text.projection;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -43,6 +42,7 @@ import org.eclipse.jface.text.ISlaveDocumentManagerExtension;
* subclassed.</p>
*
* @since 3.0
+ * @noextend This class is not intended to be subclassed by clients.
*/
public class ProjectionDocumentManager implements IDocumentListener, ISlaveDocumentManager, ISlaveDocumentManagerExtension {
@@ -144,7 +144,7 @@ public class ProjectionDocumentManager implements IDocumentListener, ISlaveDocum
public IDocumentInformationMapping createMasterSlaveMapping(IDocument slave) {
if (slave instanceof ProjectionDocument) {
ProjectionDocument projectionDocument= (ProjectionDocument) slave;
- return projectionDocument.getProjectionMapping();
+ return projectionDocument.getDocumentInformationMapping();
}
return null;
}

Back to the top