diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index abdc91b0f07..26e82451ba2 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,6 @@
+2004-04-22 Hoda Amer
+	Backing out previous changes regarding new JFace interfaces.
+	
 2004-04-22 Alain Magloire
 
 	Fix for PR 59534
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java
index 3b23654881a..9e698f3122a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProposal.java
@@ -35,13 +35,12 @@ import org.eclipse.jface.text.contentassist.ICompletionProposalExtension;
 import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
 import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3;
 import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.link.ILinkedModeListener;
-import org.eclipse.jface.text.link.LinkedModeModel;
-import org.eclipse.jface.text.link.LinkedModeUI;
-import org.eclipse.jface.text.link.LinkedPosition;
+import org.eclipse.jface.text.link.ILinkedListener;
+import org.eclipse.jface.text.link.LinkedEnvironment;
 import org.eclipse.jface.text.link.LinkedPositionGroup;
-import org.eclipse.jface.text.link.LinkedModeUI.ExitFlags;
-import org.eclipse.jface.text.link.LinkedModeUI.IExitPolicy;
+import org.eclipse.jface.text.link.LinkedUIControl;
+import org.eclipse.jface.text.link.LinkedUIControl.ExitFlags;
+import org.eclipse.jface.text.link.LinkedUIControl.IExitPolicy;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyleRange;
 import org.eclipse.swt.custom.StyledText;
@@ -50,10 +49,11 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
-import org.eclipse.ui.texteditor.link.EditorLinkedModeUI;
+import org.eclipse.ui.texteditor.link.EditorHistoryUpdater;
+
 
 public class CCompletionProposal implements ICCompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2, ICompletionProposalExtension3 {
-	
+
 	private String fDisplayString;
 	private String fReplacementString;
 	private int fReplacementOffset;
@@ -118,7 +118,7 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro
 	
 	/**
 	 * Sets the context information.
-	 * @param contextInformation The context information associated with this proposal
+	 * @param contentInformation The context information associated with this proposal
 	 */
 	public void setContextInformation(IContextInformation contextInformation) {
 		fContextInformation= contextInformation;
@@ -135,7 +135,7 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro
 	
 	/**
 	 * Sets the proposal info.
-	 * @param proposalInfo The additional information associated with this proposal or <code>null</code>
+	 * @param additionalProposalInfo The additional information associated with this proposal or <code>null</code>
 	 */
 	public void setAdditionalProposalInfo(String proposalInfo) {
 		fProposalInfo= proposalInfo;
@@ -191,22 +191,22 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro
 				int index= string.indexOf("()"); //$NON-NLS-1$
 				if (index != -1 && index + 1 == fCursorPosition) {
 					IPreferenceStore preferenceStore= CUIPlugin.getDefault().getPreferenceStore();
-//					if (preferenceStore.getBoolean(PreferenceConstants.EDITOR_CLOSE_BRACKETS)) {
+					//if (preferenceStore.getBoolean(PreferenceConstants.EDITOR_CLOSE_BRACKETS)) {
 					if(true){
 						int newOffset= fReplacementOffset + fCursorPosition;
 						
 						LinkedPositionGroup group= new LinkedPositionGroup();
-						group.addPosition(new LinkedPosition(document, newOffset, 0, LinkedPositionGroup.NO_STOP));
+						group.createPosition(document, newOffset, 0);
 						
-						LinkedModeModel model= new LinkedModeModel();
-						model.addGroup(group);
-						model.forceInstall();
+						LinkedEnvironment env= new LinkedEnvironment();
+						env.addGroup(group);
+						env.forceInstall();
 						
-						LinkedModeUI ui= new EditorLinkedModeUI(model, fTextViewer);
-						ui.setSimpleMode(true);
+						LinkedUIControl ui= new LinkedUIControl(env, fTextViewer);
+						ui.setPositionListener(new EditorHistoryUpdater());
 						ui.setExitPolicy(new ExitPolicy(')'));
 						ui.setExitPosition(fTextViewer, newOffset + 1, 0, Integer.MAX_VALUE);
-						ui.setCyclingMode(LinkedModeUI.CYCLE_NEVER);
+						ui.setCyclingMode(LinkedUIControl.CYCLE_NEVER);
 						ui.enter();
 					}
 				}
@@ -278,18 +278,18 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro
 		/*
 		 * @see org.eclipse.jdt.internal.ui.text.link.LinkedPositionUI.ExitPolicy#doExit(org.eclipse.jdt.internal.ui.text.link.LinkedPositionManager, org.eclipse.swt.events.VerifyEvent, int, int)
 		 */
-		public ExitFlags doExit(LinkedModeModel environment, VerifyEvent event, int offset, int length) {
+		public ExitFlags doExit(LinkedEnvironment environment, VerifyEvent event, int offset, int length) {
 			
 			if (event.character == fExitCharacter) {
 				if (environment.anyPositionContains(offset))
-					return new ExitFlags(ILinkedModeListener.UPDATE_CARET, false);
+					return new ExitFlags(ILinkedListener.UPDATE_CARET, false);
 				else
-					return new ExitFlags(ILinkedModeListener.UPDATE_CARET, true);
+					return new ExitFlags(ILinkedListener.UPDATE_CARET, true);
 			}	
 			
 			switch (event.character) {			
 			case ';':
-				return new ExitFlags(ILinkedModeListener.NONE, true);
+				return new ExitFlags(ILinkedListener.NONE, true);
 								
 			default:
 				return null;
@@ -343,10 +343,10 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro
 	 * @see ICompletionProposal#getAdditionalProposalInfo()
 	 */
 	public String getAdditionalProposalInfo() {
-		if (fProposalInfo != null) {
-			return fProposalInfo;
-		}
-		return null;
+//		if (fProposalInfo != null) {
+//			return fProposalInfo.getInfo();
+//		}
+		return fProposalInfo;
 	}
 	
 	/*
@@ -374,7 +374,7 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro
 	/*
 	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getCompletionOffset()
 	 */
-	public int getPrefixCompletionStart(IDocument document, int completionOffset) {
+	public int getCompletionOffset() {
 		return getReplacementOffset();
 	}
 
@@ -415,7 +415,7 @@ public class CCompletionProposal implements ICCompletionProposal, ICompletionPro
 	/*
 	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getReplacementText()
 	 */
-	public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
+	public CharSequence getCompletionText() {
 		String string= getReplacementString();
 		int pos= string.indexOf('(');
 		if (pos > 0)