diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml index 8446bae1f7c..1873bfa0035 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.xml +++ b/build/org.eclipse.cdt.make.ui/plugin.xml @@ -352,15 +352,6 @@ - - - - - - - - - - - - - - - - diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentFactory.java deleted file mode 100644 index d6497a24ce4..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentFactory.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2006 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.ui.editor; - -import org.eclipse.core.filebuffers.IDocumentFactory; -import org.eclipse.jface.text.IDocument; - -/** - * CDocumentFactory - */ -public class CDocumentFactory implements IDocumentFactory { - /** - * - */ - public CDocumentFactory() { - } - - /* - * @see org.eclipse.core.filebuffers.IDocumentFactory#createDocument() - */ - public IDocument createDocument() { - return new PartiallySynchronizedDocument(); - } - -} diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java index 3cd4245d282..ce9e7c8a81e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2002, 2005 QNX Software Systems and others. + * Copyright (c) 2002, 2006 QNX Software Systems 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 @@ -7,6 +7,7 @@ * * Contributors: * QNX Software Systems - Initial API and implementation + * Anton Leherbauer (Wind River Systems) - Fixed bug 141295 *******************************************************************************/ package org.eclipse.cdt.internal.ui.editor; @@ -38,7 +39,6 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.DefaultLineTracker; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ILineTracker; -import org.eclipse.jface.text.ISynchronizable; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.AnnotationModelEvent; @@ -868,15 +868,6 @@ public class CDocumentProvider extends TextFileDocumentProvider { return tuInfo; } - private void setUpSynchronization(TranslationUnitInfo cuInfo) { - IDocument document = cuInfo.fTextFileBuffer.getDocument(); - IAnnotationModel model = cuInfo.fModel; - if (document instanceof ISynchronizable && model instanceof ISynchronizable) { - Object lock = ((ISynchronizable) document).getLockObject(); - ((ISynchronizable) model).setLockObject(lock); - } - } - /* * @see org.eclipse.ui.editors.text.TextFileDocumentProvider#disposeFileInfo(java.lang.Object, * org.eclipse.ui.editors.text.TextFileDocumentProvider.FileInfo) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/PartiallySynchronizedDocument.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/PartiallySynchronizedDocument.java deleted file mode 100644 index d254832a3d1..00000000000 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/PartiallySynchronizedDocument.java +++ /dev/null @@ -1,132 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2006 QNX Software Systems 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * QNX Software Systems - Initial API and implementation - *******************************************************************************/ - -package org.eclipse.cdt.internal.ui.editor; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.BadPositionCategoryException; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.ISynchronizable; -import org.eclipse.jface.text.Position; - - -/** - * Document that can also be used by a background reconciler. - */ -public class PartiallySynchronizedDocument extends Document implements ISynchronizable { - - private final Object fInternalLockObject= new Object(); - private Object fLockObject; - - /* - * @see org.eclipse.jface.text.ISynchronizable#setLockObject(java.lang.Object) - */ - public void setLockObject(Object lockObject) { - fLockObject= lockObject; - } - - /* - * @see org.eclipse.jface.text.ISynchronizable#getLockObject() - */ - public Object getLockObject() { - return fLockObject == null ? fInternalLockObject : fLockObject; - } - - /* - * @see IDocumentExtension#startSequentialRewrite(boolean) - */ - public void startSequentialRewrite(boolean normalized) { - synchronized (getLockObject()) { - super.startSequentialRewrite(normalized); - } - } - - /* - * @see IDocumentExtension#stopSequentialRewrite() - */ - public void stopSequentialRewrite() { - synchronized (getLockObject()) { - super.stopSequentialRewrite(); - } - } - - /* - * @see IDocument#get() - */ - public String get() { - synchronized (getLockObject()) { - return super.get(); - } - } - - /* - * @see IDocument#get(int, int) - */ - public String get(int offset, int length) throws BadLocationException { - synchronized (getLockObject()) { - return super.get(offset, length); - } - } - - /* - * @see IDocument#getChar(int) - */ - public char getChar(int offset) throws BadLocationException { - synchronized (getLockObject()) { - return super.getChar(offset); - } - } - - /* - * @see IDocument#replace(int, int, String) - */ - public void replace(int offset, int length, String text) throws BadLocationException { - synchronized (getLockObject()) { - super.replace(offset, length, text); - } - } - - /* - * @see IDocument#set(String) - */ - public void set(String text) { - synchronized (getLockObject()) { - super.set(text); - } - } - - /* - * @see org.eclipse.jface.text.AbstractDocument#addPosition(java.lang.String, org.eclipse.jface.text.Position) - */ - public void addPosition(String category, Position position) throws BadLocationException, BadPositionCategoryException { - synchronized (getLockObject()) { - super.addPosition(category, position); - } - } - - /* - * @see org.eclipse.jface.text.AbstractDocument#removePosition(java.lang.String, org.eclipse.jface.text.Position) - */ - public void removePosition(String category, Position position) throws BadPositionCategoryException { - synchronized (getLockObject()) { - super.removePosition(category, position); - } - } - - /* - * @see org.eclipse.jface.text.AbstractDocument#getPositions(java.lang.String) - */ - public Position[] getPositions(String category) throws BadPositionCategoryException { - synchronized (getLockObject()) { - return super.getPositions(category); - } - } -}