Bug 103173: Register: user created register groups disappear after debug session restart.

2 files changed, 18 insertions, 3 deletions

diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 748bc7e28f7..b65fff4d769 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-10 Mikhail Khodjaiants

+	Bug 103173: Register: user created register groups disappear after debug session restart.

+	* CRegisterManager.java

+

 2005-07-08 Mikhail Khodjaiants

 	Filter breakpoints before setting using the source lookup mechanism.

 	* CBreakpointManager.java

diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
index caaac61475b..ef9e1c3ac7c 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CRegisterManager.java
@@ -133,6 +133,7 @@ public class CRegisterManager {
 			new Runnable() {
 				public void run() {
 					fRegisterGroups.add( new CRegisterGroup( getDebugTarget(), name, descriptors ) );
+					setUseDefaultRegisterGroups( false );
 					getDebugTarget().fireChangeEvent( DebugEvent.CONTENT );
 				}
 			} );
@@ -149,6 +150,7 @@ public class CRegisterManager {
 						}
 						fRegisterGroups.clear();
 					}
+					setUseDefaultRegisterGroups( false );
 					getDebugTarget().fireChangeEvent( DebugEvent.CONTENT );
 				}
 			} );
@@ -162,6 +164,7 @@ public class CRegisterManager {
 						((CRegisterGroup)groups[i]).dispose();
 					}
 					fRegisterGroups.removeAll( Arrays.asList( groups ) );
+					setUseDefaultRegisterGroups( false );
 					getDebugTarget().fireChangeEvent( DebugEvent.CONTENT );
 				}
 			} );
@@ -237,11 +240,11 @@ public class CRegisterManager {
 			}
 			childNode = childNode.getNextSibling();
 		}
-		fUseDefaultRegisterGroups = false;
+		setUseDefaultRegisterGroups( false );
 	}
 
 	protected void initializeDefaults() {
-		fUseDefaultRegisterGroups = true;
+		setUseDefaultRegisterGroups( true );
 		String current = null;
 		int startIndex = 0;
 		for ( int i = 0; i < fRegisterDescriptors.length; ++i ) {
@@ -278,7 +281,7 @@ public class CRegisterManager {
 	}
 
 	private String getMemento() throws CoreException {
-		if ( fUseDefaultRegisterGroups || fRegisterGroups == null )
+		if ( useDefaultRegisterGroups() || fRegisterGroups == null )
 			return ""; //$NON-NLS-1$
 		Document document = DebugPlugin.newDocument();
 		Element element = document.createElement( ELEMENT_REGISTER_GROUP_LIST );
@@ -317,4 +320,12 @@ public class CRegisterManager {
 				} );
 		
 	}
+	
+	protected boolean useDefaultRegisterGroups() {
+		return fUseDefaultRegisterGroups;
+	}
+	
+	protected void setUseDefaultRegisterGroups( boolean useDefaultRegisterGroups ) {
+		fUseDefaultRegisterGroups = useDefaultRegisterGroups;
+	}
 }