From 199268d640c8919ff2d01676d17aeec3ad1a60c8 Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Wed, 16 Feb 2005 20:29:33 +0000 Subject: [PATCH] Bug 82264: Enhance the Shared Libraries view. The symbols file name isn't shown in the detail pane if module's symbols are not loaded. --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 6 ++++++ .../ui/views/modules/ModulesView.java | 19 ++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index 8f9a6fcf1c9..22f33602bb0 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,9 @@ +2005-02-16 Mikhail Khodjaiants + Bug 82264: Enhance the Shared Libraries view. + The symbols file name isn't shown in the detail pane if module's + symbols are not loaded. + * ModulesView.java + 2005-02-16 Mikhail Khodjaiants Bug 82264: Enhance the Shared Libraries view. The "Load Symbols" action doesn't update the detail value. diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java index 981f3c8e03f..932056de3ee 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/views/modules/ModulesView.java @@ -880,6 +880,8 @@ public class ModulesView extends AbstractDebugEventHandlerView implements IDebug private String getModuleDetail( ICModule module ) { StringBuffer sb = new StringBuffer(); + + // Type String type = null; switch( module.getType() ) { case ICModule.EXECUTABLE: @@ -894,15 +896,18 @@ public class ModulesView extends AbstractDebugEventHandlerView implements IDebug sb.append( type ); sb.append( '\n' ); } + + // Symbols flag sb.append( ModulesMessages.getString( "ModulesView.4" ) ); //$NON-NLS-1$ sb.append( ( module.areSymbolsLoaded() ) ? ModulesMessages.getString( "ModulesView.5" ) : ModulesMessages.getString( "ModulesView.6" ) ); //$NON-NLS-1$ //$NON-NLS-2$ sb.append( '\n' ); - if ( module.areSymbolsLoaded() ) { - sb.append( ModulesMessages.getString( "ModulesView.7" ) ); //$NON-NLS-1$ - sb.append( module.getSymbolsFileName().toOSString() ); - sb.append( '\n' ); - } + // Symbols file + sb.append( ModulesMessages.getString( "ModulesView.7" ) ); //$NON-NLS-1$ + sb.append( module.getSymbolsFileName().toOSString() ); + sb.append( '\n' ); + + // CPU String cpu = module.getCPU(); if ( cpu != null ) { sb.append( ModulesMessages.getString( "ModulesView.8" ) ); //$NON-NLS-1$ @@ -910,18 +915,22 @@ public class ModulesView extends AbstractDebugEventHandlerView implements IDebug sb.append( '\n' ); } + // Base address IAddress baseAddress = module.getBaseAddress(); if ( !baseAddress.isZero() ) { sb.append( ModulesMessages.getString( "ModulesView.9" ) ); //$NON-NLS-1$ sb.append( baseAddress.toHexAddressString() ); sb.append( '\n' ); } + + // Size long size = module.getSize(); if ( size > 0 ) { sb.append( ModulesMessages.getString( "ModulesView.10" ) ); //$NON-NLS-1$ sb.append( size ); sb.append( '\n' ); } + return sb.toString(); }