diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog
index b49d48fb8fa..f90d0f6d9e4 100644
--- a/debug/org.eclipse.cdt.debug.ui/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-11 Mikhail Khodjaiants
+	New implementation of the "Auto-Refresh" actions for registers and shared libraries.
+	* plugin.properties
+	* plugin.xml	
+	* AbstractAutoRefreshActionDelegate.java: new
+	* AutoRefreshRegistersAction.java: new
+	* AutoRefreshSharedLibrariesAction.java: new
+	* AutoRefreshAction.java: removed
+	* AbstractRefreshActionDelegate.java
+
 2004-06-09 Mikhail Khodjaiants
 	New implementation of the "Refresh" actions for registers and shared libraries.
 	* icons/full/clcl16/auto_refresh_co.gif: new
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index 38f7a5472b0..04dcdebb85f 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -103,4 +103,6 @@ DisassemblyFontDefinition.label=Disassembly View text font
 DisassemblyFontDefinition.description=The font used in the Disassembly view.
 
 RefreshAction.label=Refresh
-RefreshAction.tooltip=Refresh View's Content
\ No newline at end of file
+RefreshAction.tooltip=Refresh View's Content
+AutoRefreshAction.label=Auto-Refresh
+AutoRefreshAction.tooltip=Automatically Refresh View's Content
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 70c181e49e6..b58f9fcfcd9 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -979,6 +979,23 @@
                      id="org.eclipse.cdt.debug.ui"/>
             </enablement>
          </action>
+         <action
+               helpContextId="auto_refresh_shared_libraries_context"
+               disabledIcon="icons/full/dlcl16/auto_refresh_co.gif"
+               hoverIcon="icons/full/clcl16/auto_refresh_co.gif"
+               toolbarPath="refreshGroup"
+               label="%AutoRefreshAction.label"
+               tooltip="%AutoRefreshAction.tooltip"
+               icon="icons/full/elcl16/auto_refresh_co.gif"
+               class="org.eclipse.cdt.debug.internal.ui.actions.AutoRefreshSharedLibrariesActionDelegate"
+               style="toggle"
+               id="org.eclipse.cdt.debug.internal.ui.actions.AutoRefreshSharedLibrariesActionDelegate">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui"/>
+            </enablement>
+         </action>
       </viewContribution>
       <viewContribution
             targetID="org.eclipse.debug.ui.RegisterView"
@@ -1006,6 +1023,24 @@
                      id="org.eclipse.cdt.debug.ui"/>
             </enablement>
          </action>
+         <action
+               helpContextId="auto_refresh_registers_context"
+               disabledIcon="icons/full/dlcl16/auto_refresh_co.gif"
+               hoverIcon="icons/full/clcl16/auto_refresh_co.gif"
+               toolbarPath="refreshGroup"
+               label="%AutoRefreshAction.label"
+               tooltip="%AutoRefreshAction.tooltip"
+               icon="icons/full/elcl16/auto_refresh_co.gif"
+               class="org.eclipse.cdt.debug.internal.ui.actions.AutoRefreshRegistersActionDelegate"
+               style="toggle"
+               state="false"
+               id="org.eclipse.cdt.debug.internal.ui.actions.AutoRefreshRegistersActionDelegate">
+            <enablement>
+               <pluginState
+                     value="activated"
+                     id="org.eclipse.cdt.debug.ui"/>
+            </enablement>
+         </action>
       </viewContribution>
    </extension>
    <extension
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractAutoRefreshActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractAutoRefreshActionDelegate.java
new file mode 100644
index 00000000000..8071fe09568
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractAutoRefreshActionDelegate.java
@@ -0,0 +1,93 @@
+/**********************************************************************
+ * Copyright (c) 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ ***********************************************************************/ 
+package org.eclipse.cdt.debug.internal.ui.actions; 
+
+import org.eclipse.cdt.debug.core.ICUpdateManager;
+import org.eclipse.debug.ui.IDebugView;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.ui.IViewActionDelegate;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.actions.ActionDelegate;
+import org.eclipse.ui.texteditor.IUpdate;
+ 
+/**
+ * The superclass for all "Auto-Refresh" action delegates.
+ */
+public abstract class AbstractAutoRefreshActionDelegate extends ActionDelegate implements IViewActionDelegate, IUpdate {
+
+	private IAction fAction;
+	private IDebugView fView;
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.actions.ActionDelegate#init(org.eclipse.jface.action.IAction)
+	 */
+	public void init( IAction action ) {
+		setAction( action );
+		super.init( action );
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
+	 */
+	public void init( IViewPart view ) {
+		setView( view );
+		if ( getView() != null ) {
+			getView().add( this );
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.texteditor.IUpdate#update()
+	 */
+	public void update() {
+		IAction action = getAction();
+		if ( getView() != null && action != null ) {
+			ICUpdateManager um = getUpdateManager( getView().getViewer().getInput() );
+			action.setEnabled( ( um != null ) ? um.canUpdate() : false );
+			action.setChecked( ( um != null ) ? um.getAutoModeEnabled() : false );
+		}
+	}
+
+	public void run( IAction action ) {
+		if ( getView() != null ) { 
+			ICUpdateManager um = getUpdateManager( getView().getViewer().getInput() );
+			if ( um != null )
+				um.setAutoModeEnabled( action.isChecked() );
+		}
+	}
+
+	protected IAction getAction() {
+		return fAction;
+	}
+
+	private void setAction( IAction action ) {
+		fAction = action;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.actions.ActionDelegate#dispose()
+	 */
+	public void dispose() {
+		if ( getView() != null )
+			getView().remove( this );
+		super.dispose();
+	}
+
+	protected IDebugView getView() {
+		return fView;
+	}
+
+	private void setView( IViewPart view ) {
+		fView = ( view instanceof IDebugView ) ? (IDebugView)view : null;
+	}
+
+	protected abstract ICUpdateManager getUpdateManager( Object element );
+}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractRefreshActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractRefreshActionDelegate.java
index 624c2184e2e..3a2eeae2a0a 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractRefreshActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AbstractRefreshActionDelegate.java
@@ -78,7 +78,6 @@ public abstract class AbstractRefreshActionDelegate extends ActionDelegate imple
 			action.setEnabled( ( um != null ) ? um.canUpdate() : false );
 		}
 	}
-
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshAction.java
deleted file mode 100644
index 04e9df26688..00000000000
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *(c) Copyright QNX Software Systems Ltd. 2002.
- * All Rights Reserved.
- * 
- */
-package org.eclipse.cdt.debug.internal.ui.actions;
-
-import org.eclipse.cdt.debug.core.ICUpdateManager;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.texteditor.IUpdate;
-
-/**
- * Enter type comment.
- * 
- * @since: Feb 10, 2003
- */
-public class AutoRefreshAction extends Action implements IUpdate
-{
-	private Viewer fViewer = null;
-
-	/**
-	 * Constructor for AutoRefreshAction.
-	 */
-	public AutoRefreshAction( Viewer viewer, String text )
-	{
-		super( text, IAction.AS_CHECK_BOX );
-		fViewer = viewer;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
-	public void update()
-	{
-		if ( fViewer != null && fViewer.getInput() instanceof IAdaptable )
-		{
-			ICUpdateManager uman = (ICUpdateManager)((IAdaptable)fViewer.getInput()).getAdapter( ICUpdateManager.class );
-			if ( uman != null )
-			{
-				setEnabled( uman.canUpdate() );
-				setChecked( uman.getAutoModeEnabled() );
-				return;
-			}
-		}
-		setEnabled( false );
-		setChecked( false );
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
-	public void run()
-	{
-		if ( fViewer != null && fViewer.getInput() instanceof IAdaptable )
-		{
-			ICUpdateManager uman = (ICUpdateManager)((IAdaptable)fViewer.getInput()).getAdapter( ICUpdateManager.class );
-			if ( uman != null )
-			{
-				uman.setAutoModeEnabled( isChecked() );
-			}
-		}
-	}
-}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshRegistersActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshRegistersActionDelegate.java
new file mode 100644
index 00000000000..c8531ebc6b8
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshRegistersActionDelegate.java
@@ -0,0 +1,31 @@
+/**********************************************************************
+ * Copyright (c) 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ ***********************************************************************/ 
+package org.eclipse.cdt.debug.internal.ui.actions; 
+
+import org.eclipse.cdt.debug.core.ICRegisterManager;
+import org.eclipse.cdt.debug.core.ICUpdateManager;
+import org.eclipse.debug.core.model.IDebugElement;
+
+/**
+ * A delegate for the "Auto-Refresh" action of the Registers view.
+ */
+public class AutoRefreshRegistersActionDelegate extends AbstractAutoRefreshActionDelegate {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractAutoRefreshActionDelegate#getUpdateManager(java.lang.Object)
+	 */
+	protected ICUpdateManager getUpdateManager( Object element ) {
+		if ( element instanceof IDebugElement ) {
+			return (ICUpdateManager)((IDebugElement)element).getDebugTarget().getAdapter( ICRegisterManager.class );
+		}
+		return null;
+	}
+}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshSharedLibrariesActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshSharedLibrariesActionDelegate.java
new file mode 100644
index 00000000000..5af4499db30
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AutoRefreshSharedLibrariesActionDelegate.java
@@ -0,0 +1,31 @@
+/**********************************************************************
+ * Copyright (c) 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ ***********************************************************************/ 
+package org.eclipse.cdt.debug.internal.ui.actions; 
+
+import org.eclipse.cdt.debug.core.ICSharedLibraryManager;
+import org.eclipse.cdt.debug.core.ICUpdateManager;
+import org.eclipse.debug.core.model.IDebugElement;
+
+/**
+ * A delegate for the "Auto-Refresh" action of the Shared Libraries view.
+ */
+public class AutoRefreshSharedLibrariesActionDelegate extends AbstractAutoRefreshActionDelegate {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.debug.internal.ui.actions.AbstractAutoRefreshActionDelegate#getUpdateManager(java.lang.Object)
+	 */
+	protected ICUpdateManager getUpdateManager( Object element ) {
+		if ( element instanceof IDebugElement ) {
+			return (ICUpdateManager)((IDebugElement)element).getDebugTarget().getAdapter( ICSharedLibraryManager.class );
+		}
+		return null;
+	}
+}