# HG changeset patch # User wpaul # Date 1248300546 18000 # Node ID 9051ca8b33f568008fbdf8dabb66ab2180f88d05 # Parent 8addaa0ffc18d4f194fa397960491d05fd8c692f updated contents of the Symbian OS data view. diff -r 8addaa0ffc18 -r 9051ca8b33f5 debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectChunk.java --- a/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectChunk.java Wed Jul 22 16:55:46 2009 -0500 +++ b/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectChunk.java Wed Jul 22 17:09:06 2009 -0500 @@ -26,23 +26,17 @@ // Property Descriptors static protected IPropertyDescriptor[] s_propertyDescriptors = { - new PropertyDescriptor(IOSObjectProperties.ID.ObjectType, - IOSObjectProperties.DisplayName.ObjectType), - new PropertyDescriptor(IOSObjectProperties.ID.Name, - IOSObjectProperties.DisplayName.Name), - - new PropertyDescriptor(IOSObjectProperties.ID.Attribute, - IOSObjectProperties.DisplayName.Attribute), - new PropertyDescriptor(IOSObjectProperties.ID.HomeAddress, - IOSObjectProperties.DisplayName.HomeAddress), - new PropertyDescriptor(IOSObjectProperties.ID.Size, - IOSObjectProperties.DisplayName.Size), - new PropertyDescriptor(IOSObjectProperties.ID.State, - IOSObjectProperties.DisplayName.State), - new PropertyDescriptor(IOSObjectProperties.ID.Type, - IOSObjectProperties.DisplayName.Type), - new PropertyDescriptor(IOSObjectProperties.ID.OwningProcessName, - IOSObjectProperties.DisplayName.OwningProcessName), }; + new PropertyDescriptor(IOSObjectProperties.ID.ObjectType, + IOSObjectProperties.DisplayName.ObjectType), + new PropertyDescriptor(IOSObjectProperties.ID.Name, + IOSObjectProperties.DisplayName.Name), + new PropertyDescriptor(IOSObjectProperties.ID.Size, + IOSObjectProperties.DisplayName.Size), + new PropertyDescriptor(IOSObjectProperties.ID.Type, + IOSObjectProperties.DisplayName.Type), + new PropertyDescriptor(IOSObjectProperties.ID.OwningProcessName, + IOSObjectProperties.DisplayName.OwningProcessName) + }; static { for (int i = 0; i < s_propertyDescriptors.length; i++) @@ -51,10 +45,11 @@ } static private String[] s_sortableProperties = { - IOSObjectProperties.ID.Name, IOSObjectProperties.ID.Type, - IOSObjectProperties.ID.Size, - IOSObjectProperties.ID.OwningProcessName, - IOSObjectProperties.ID.State, }; + IOSObjectProperties.ID.Name, + IOSObjectProperties.ID.Size, + IOSObjectProperties.ID.Type, + IOSObjectProperties.ID.OwningProcessName, + }; static private IPropertyDescriptor[] s_sortablePropertyDescriptors; static { diff -r 8addaa0ffc18 -r 9051ca8b33f5 debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectLibrary.java --- a/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectLibrary.java Wed Jul 22 16:55:46 2009 -0500 +++ b/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectLibrary.java Wed Jul 22 17:09:06 2009 -0500 @@ -26,33 +26,24 @@ // Property Descriptors static protected IPropertyDescriptor[] s_propertyDescriptors = { - new PropertyDescriptor(IOSObjectProperties.ID.ObjectType, - IOSObjectProperties.DisplayName.ObjectType), - - new PropertyDescriptor(IOSObjectProperties.ID.Name, - IOSObjectProperties.DisplayName.Name), - new PropertyDescriptor(IOSObjectProperties.ID.BssSize, - IOSObjectProperties.DisplayName.BssSize), - new PropertyDescriptor(IOSObjectProperties.ID.CodeLoadAddress, - IOSObjectProperties.DisplayName.CodeLoadAddress), - new PropertyDescriptor(IOSObjectProperties.ID.CodeRunAddress, - IOSObjectProperties.DisplayName.CodeRunAddress), - new PropertyDescriptor(IOSObjectProperties.ID.DataSize, - IOSObjectProperties.DisplayName.DataSize), - new PropertyDescriptor(IOSObjectProperties.ID.DataRunAddress, - IOSObjectProperties.DisplayName.DataRunAddress), - new PropertyDescriptor(IOSObjectProperties.ID.DataLoadAddress, - IOSObjectProperties.DisplayName.DataLoadAddress), - new PropertyDescriptor(IOSObjectProperties.ID.DependencyCount, - IOSObjectProperties.DisplayName.DependencyCount), - new PropertyDescriptor(IOSObjectProperties.ID.DependencyFiles, - IOSObjectProperties.DisplayName.DependencyFiles), - new PropertyDescriptor(IOSObjectProperties.ID.MapCount, - IOSObjectProperties.DisplayName.MapCount), - new PropertyDescriptor(IOSObjectProperties.ID.State, - IOSObjectProperties.DisplayName.State), - new PropertyDescriptor(IOSObjectProperties.ID.TextSize, - IOSObjectProperties.DisplayName.TextSize), }; + new PropertyDescriptor(IOSObjectProperties.ID.ObjectType, + IOSObjectProperties.DisplayName.ObjectType), + + new PropertyDescriptor(IOSObjectProperties.ID.Name, + IOSObjectProperties.DisplayName.Name), + new PropertyDescriptor(IOSObjectProperties.ID.CodeRunAddress, + IOSObjectProperties.DisplayName.CodeRunAddress), + new PropertyDescriptor(IOSObjectProperties.ID.TextSize, + IOSObjectProperties.DisplayName.TextSize), + new PropertyDescriptor(IOSObjectProperties.ID.DataRunAddress, + IOSObjectProperties.DisplayName.DataRunAddress), + new PropertyDescriptor(IOSObjectProperties.ID.DataSize, + IOSObjectProperties.DisplayName.DataSize), + new PropertyDescriptor(IOSObjectProperties.ID.MapCount, + IOSObjectProperties.DisplayName.MapCount), + new PropertyDescriptor(IOSObjectProperties.ID.State, + IOSObjectProperties.DisplayName.State) + }; static { for (int i = 0; i < s_propertyDescriptors.length; i++) @@ -61,9 +52,14 @@ } static private String[] s_sortableProperties = { - IOSObjectProperties.ID.Name, IOSObjectProperties.ID.TextSize, - IOSObjectProperties.ID.CodeRunAddress, - IOSObjectProperties.ID.CodeLoadAddress, }; + IOSObjectProperties.ID.Name, + IOSObjectProperties.ID.CodeRunAddress, + IOSObjectProperties.ID.TextSize, + IOSObjectProperties.ID.DataRunAddress, + IOSObjectProperties.ID.DataSize, + IOSObjectProperties.ID.MapCount, + IOSObjectProperties.ID.State + }; static private IPropertyDescriptor[] s_sortablePropertyDescriptors; static { diff -r 8addaa0ffc18 -r 9051ca8b33f5 debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectProcess.java --- a/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectProcess.java Wed Jul 22 16:55:46 2009 -0500 +++ b/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectProcess.java Wed Jul 22 17:09:06 2009 -0500 @@ -30,38 +30,23 @@ // Property Descriptors static protected IPropertyDescriptor[] s_propertyDescriptors = { - new PropertyDescriptor(IOSObjectProperties.ID.ObjectType, - IOSObjectProperties.DisplayName.ObjectType), - new PropertyDescriptor(IOSObjectProperties.ID.Name, - IOSObjectProperties.DisplayName.Name), - new PropertyDescriptor(IOSObjectProperties.ID.ID, - IOSObjectProperties.DisplayName.ID), - new PropertyDescriptor(IOSObjectProperties.ID.Priority, - IOSObjectProperties.DisplayName.Priority), - new PropertyDescriptor(IOSObjectProperties.ID.Attribute, - IOSObjectProperties.DisplayName.Attribute), - new PropertyDescriptor(IOSObjectProperties.ID.CodeRunAddress, - IOSObjectProperties.DisplayName.CodeRunAddress), - new PropertyDescriptor(IOSObjectProperties.ID.CodeLoadAddress, - IOSObjectProperties.DisplayName.CodeLoadAddress), - new PropertyDescriptor(IOSObjectProperties.ID.TextSize, - IOSObjectProperties.DisplayName.TextSize), - new PropertyDescriptor(IOSObjectProperties.ID.DataSize, - IOSObjectProperties.DisplayName.DataSize), - new PropertyDescriptor(IOSObjectProperties.ID.BssSize, - IOSObjectProperties.DisplayName.BssSize), - new PropertyDescriptor(IOSObjectProperties.ID.DataBssRunAddress, - IOSObjectProperties.DisplayName.DataBssRunAddress), - new PropertyDescriptor(IOSObjectProperties.ID.DataRunAddress, - IOSObjectProperties.DisplayName.DataRunAddress), - new PropertyDescriptor(IOSObjectProperties.ID.DataLoadAddress, - IOSObjectProperties.DisplayName.DataLoadAddress), - new PropertyDescriptor(IOSObjectProperties.ID.DataBssStackChunk, - IOSObjectProperties.DisplayName.DataBssStackChunk), - new PropertyDescriptor(IOSObjectProperties.ID.DependencyCount, - IOSObjectProperties.DisplayName.DependencyCount), - new PropertyDescriptor(IOSObjectProperties.ID.DependencyFiles, - IOSObjectProperties.DisplayName.DependencyFiles), }; + new PropertyDescriptor(IOSObjectProperties.ID.ObjectType, + IOSObjectProperties.DisplayName.ObjectType), + new PropertyDescriptor(IOSObjectProperties.ID.Name, + IOSObjectProperties.DisplayName.Name), + new PropertyDescriptor(IOSObjectProperties.ID.ID, + IOSObjectProperties.DisplayName.ID), + new PropertyDescriptor(IOSObjectProperties.ID.Priority, + IOSObjectProperties.DisplayName.Priority), + new PropertyDescriptor(IOSObjectProperties.ID.CodeRunAddress, + IOSObjectProperties.DisplayName.CodeRunAddress), + new PropertyDescriptor(IOSObjectProperties.ID.TextSize, + IOSObjectProperties.DisplayName.TextSize), + new PropertyDescriptor(IOSObjectProperties.ID.DataRunAddress, + IOSObjectProperties.DisplayName.DataRunAddress), + new PropertyDescriptor(IOSObjectProperties.ID.DataSize, + IOSObjectProperties.DisplayName.DataSize) + }; static { for (int i = 0; i < s_propertyDescriptors.length; i++) @@ -70,11 +55,14 @@ } static private String[] s_sortableProperties = { - IOSObjectProperties.ID.Name, IOSObjectProperties.ID.ID, - IOSObjectProperties.ID.Priority, - IOSObjectProperties.ID.CodeRunAddress, - IOSObjectProperties.ID.CodeLoadAddress, - IOSObjectProperties.ID.TextSize, IOSObjectProperties.ID.DataSize }; + IOSObjectProperties.ID.Name, + IOSObjectProperties.ID.ID, + IOSObjectProperties.ID.Priority, + IOSObjectProperties.ID.CodeRunAddress, + IOSObjectProperties.ID.TextSize, + IOSObjectProperties.ID.DataRunAddress, + IOSObjectProperties.ID.DataSize + }; static private IPropertyDescriptor[] s_sortablePropertyDescriptors; static { diff -r 8addaa0ffc18 -r 9051ca8b33f5 debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectThread.java --- a/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectThread.java Wed Jul 22 16:55:46 2009 -0500 +++ b/debuggercdi/com.nokia.carbide.cpp.debug.kernelaware/src/com/nokia/carbide/cpp/debug/kernelaware/OSObjectThread.java Wed Jul 22 17:09:06 2009 -0500 @@ -30,37 +30,19 @@ // Property Descriptors static protected IPropertyDescriptor[] s_propertyDescriptors = { - new PropertyDescriptor(IOSObjectProperties.ID.ObjectType, - IOSObjectProperties.DisplayName.ObjectType), - new PropertyDescriptor(IOSObjectProperties.ID.Name, - IOSObjectProperties.DisplayName.Name), - - new PropertyDescriptor(IOSObjectProperties.ID.ContextType, - IOSObjectProperties.DisplayName.ContextType), - new PropertyDescriptor(IOSObjectProperties.ID.ID, - IOSObjectProperties.DisplayName.ID), - new PropertyDescriptor(IOSObjectProperties.ID.OwningProcessID, - IOSObjectProperties.DisplayName.OwningProcessID), - new PropertyDescriptor(IOSObjectProperties.ID.OwningProcessName, - IOSObjectProperties.DisplayName.OwningProcessName), - new PropertyDescriptor(IOSObjectProperties.ID.Priority, - IOSObjectProperties.DisplayName.Priority), - new PropertyDescriptor(IOSObjectProperties.ID.SavedStackAddr, - IOSObjectProperties.DisplayName.SavedStackAddr), - new PropertyDescriptor(IOSObjectProperties.ID.State, - IOSObjectProperties.DisplayName.State), - new PropertyDescriptor(IOSObjectProperties.ID.SupervisorStackAddr, - IOSObjectProperties.DisplayName.SupervisorStackAddr), - new PropertyDescriptor(IOSObjectProperties.ID.SupervisorStackSize, - IOSObjectProperties.DisplayName.SupervisorStackSize), - new PropertyDescriptor(IOSObjectProperties.ID.ThreadBase, - IOSObjectProperties.DisplayName.ThreadBase), - new PropertyDescriptor(IOSObjectProperties.ID.Type, - IOSObjectProperties.DisplayName.Type), - new PropertyDescriptor(IOSObjectProperties.ID.UserStackAddr, - IOSObjectProperties.DisplayName.UserStackAddr), - new PropertyDescriptor(IOSObjectProperties.ID.UserStackSize, - IOSObjectProperties.DisplayName.UserStackSize), }; + new PropertyDescriptor(IOSObjectProperties.ID.ObjectType, + IOSObjectProperties.DisplayName.ObjectType), + new PropertyDescriptor(IOSObjectProperties.ID.Name, + IOSObjectProperties.DisplayName.Name), + new PropertyDescriptor(IOSObjectProperties.ID.ID, + IOSObjectProperties.DisplayName.ID), + new PropertyDescriptor(IOSObjectProperties.ID.Priority, + IOSObjectProperties.DisplayName.Priority), + new PropertyDescriptor(IOSObjectProperties.ID.State, + IOSObjectProperties.DisplayName.State), + new PropertyDescriptor(IOSObjectProperties.ID.OwningProcessName, + IOSObjectProperties.DisplayName.OwningProcessName) + }; static { for (int i = 0; i < s_propertyDescriptors.length; i++) @@ -69,10 +51,12 @@ } static private String[] s_sortableProperties = { - IOSObjectProperties.ID.Name, IOSObjectProperties.ID.ID, - IOSObjectProperties.ID.Priority, - IOSObjectProperties.ID.OwningProcessName, - IOSObjectProperties.ID.State, IOSObjectProperties.ID.ThreadBase, }; + IOSObjectProperties.ID.Name, + IOSObjectProperties.ID.ID, + IOSObjectProperties.ID.Priority, + IOSObjectProperties.ID.State, + IOSObjectProperties.ID.OwningProcessName + }; static private IPropertyDescriptor[] s_sortablePropertyDescriptors; static {